[svn] commit: r4122 - in /branches/trac384: ./ doc/guide/ src/bin/auth/ src/bin/auth/benchmarks/ src/bin/auth/tests/ src/bin/auth/tests/testdata/ src/bin/bind10/ src/bin/bind10/tests/ src/bin/bindctl/ src/bin/bindctl/tests/ src/bin/cfgmgr/tests/ src/bin/cmdctl/ src/bin/cmdctl/tests/ src/bin/loadzone/ src/bin/loadzone/tests/correct/ src/bin/loadzone/tests/error/ src/bin/msgq/ src/bin/msgq/tests/ src/bin/recurse/ src/bin/stats/ src/bin/stats/tests/ src/bin/tests/ src/bin/usermgr/ src/bin/xfrin/ src/bin/xfrin/tests/ src/bin/xfrout/ src/bin/xfrout/tests/ src/bin/zonemgr/ src/bin/zonemgr/tests/ src/lib/asiolink/ src/lib/asiolink/internal/ src/lib/asiolink/tests/ src/lib/config/ src/lib/config/tests/ src/lib/config/tests/testdata/ src/lib/datasrc/ src/lib/datasrc/tests/ src/lib/datasrc/tests/testdata/ src/lib/dns/python/tests/ src/lib/python/isc/cc/tests/ src/lib/python/isc/config/ src/lib/python/isc/config/tests/ src/lib/python/isc/datasrc/tests/ src/lib/python/isc/log/tests/ src/lib/python/isc/net/tests/ src/lib/python/isc/notify/tests/ src/lib/python/isc/util/tests/ src/lib/python/isc/utils/ src/lib/testutils/testdata/
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Jan 3 13:47:42 UTC 2011
Author: jelte
Date: Mon Jan 3 13:47:41 2011
New Revision: 4122
Log:
sync with trunk
Added:
branches/trac384/src/bin/auth/config.cc
- copied unchanged from r4121, trunk/src/bin/auth/config.cc
branches/trac384/src/bin/auth/config.h
- copied unchanged from r4121, trunk/src/bin/auth/config.h
branches/trac384/src/bin/auth/statistics.cc
- copied unchanged from r4121, trunk/src/bin/auth/statistics.cc
branches/trac384/src/bin/auth/statistics.h
- copied unchanged from r4121, trunk/src/bin/auth/statistics.h
branches/trac384/src/bin/auth/tests/config_unittest.cc
- copied unchanged from r4121, trunk/src/bin/auth/tests/config_unittest.cc
branches/trac384/src/bin/auth/tests/statistics_unittest.cc
- copied unchanged from r4121, trunk/src/bin/auth/tests/statistics_unittest.cc
branches/trac384/src/bin/auth/tests/testdata/ (props changed)
- copied from r4121, trunk/src/bin/auth/tests/testdata/
branches/trac384/src/lib/config/tests/testdata/data22_9.data
- copied unchanged from r4121, trunk/src/lib/config/tests/testdata/data22_9.data
branches/trac384/src/lib/datasrc/result.h
- copied unchanged from r4121, trunk/src/lib/datasrc/result.h
branches/trac384/src/lib/datasrc/tests/testdata/duplicate_rrset.zone
- copied unchanged from r4121, trunk/src/lib/datasrc/tests/testdata/duplicate_rrset.zone
branches/trac384/src/lib/datasrc/zone.h
- copied unchanged from r4121, trunk/src/lib/datasrc/zone.h
branches/trac384/src/lib/python/isc/utils/ (props changed)
- copied from r4121, trunk/src/lib/python/isc/utils/
branches/trac384/src/lib/testutils/testdata/example.com.zone
- copied unchanged from r4121, trunk/src/lib/testutils/testdata/example.com.zone
branches/trac384/src/lib/testutils/testdata/example.net.zone
- copied unchanged from r4121, trunk/src/lib/testutils/testdata/example.net.zone
branches/trac384/src/lib/testutils/testdata/example.org.zone
- copied unchanged from r4121, trunk/src/lib/testutils/testdata/example.org.zone
branches/trac384/src/lib/testutils/testdata/example.zone
- copied unchanged from r4121, trunk/src/lib/testutils/testdata/example.zone
branches/trac384/src/lib/testutils/testdata/iquery_fromWire.spec
- copied unchanged from r4121, trunk/src/lib/testutils/testdata/iquery_fromWire.spec
branches/trac384/src/lib/testutils/testdata/iquery_response_fromWire.spec
- copied unchanged from r4121, trunk/src/lib/testutils/testdata/iquery_response_fromWire.spec
Modified:
branches/trac384/ (props changed)
branches/trac384/ChangeLog
branches/trac384/Makefile.am
branches/trac384/README
branches/trac384/configure.ac
branches/trac384/doc/guide/bind10-guide.xml
branches/trac384/src/bin/auth/Makefile.am
branches/trac384/src/bin/auth/auth.spec.pre.in
branches/trac384/src/bin/auth/auth_srv.cc
branches/trac384/src/bin/auth/auth_srv.h
branches/trac384/src/bin/auth/benchmarks/Makefile.am
branches/trac384/src/bin/auth/benchmarks/query_bench.cc
branches/trac384/src/bin/auth/change_user.cc
branches/trac384/src/bin/auth/common.h
branches/trac384/src/bin/auth/main.cc
branches/trac384/src/bin/auth/query.cc
branches/trac384/src/bin/auth/query.h
branches/trac384/src/bin/auth/tests/Makefile.am
branches/trac384/src/bin/auth/tests/auth_srv_unittest.cc
branches/trac384/src/bin/auth/tests/query_unittest.cc
branches/trac384/src/bin/bind10/bind10.py.in (contents, props changed)
branches/trac384/src/bin/bind10/run_bind10.sh.in
branches/trac384/src/bin/bind10/tests/Makefile.am
branches/trac384/src/bin/bindctl/run_bindctl.sh.in
branches/trac384/src/bin/bindctl/tests/Makefile.am
branches/trac384/src/bin/cfgmgr/tests/Makefile.am
branches/trac384/src/bin/cmdctl/run_b10-cmdctl.sh.in
branches/trac384/src/bin/cmdctl/tests/Makefile.am
branches/trac384/src/bin/loadzone/run_loadzone.sh.in
branches/trac384/src/bin/loadzone/tests/correct/Makefile.am
branches/trac384/src/bin/loadzone/tests/error/Makefile.am
branches/trac384/src/bin/msgq/run_msgq.sh.in
branches/trac384/src/bin/msgq/tests/Makefile.am
branches/trac384/src/bin/recurse/b10-recurse.8
branches/trac384/src/bin/recurse/b10-recurse.xml
branches/trac384/src/bin/stats/run_b10-stats.sh.in
branches/trac384/src/bin/stats/run_b10-stats_stub.sh.in
branches/trac384/src/bin/stats/tests/Makefile.am
branches/trac384/src/bin/tests/Makefile.am
branches/trac384/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in
branches/trac384/src/bin/xfrin/run_b10-xfrin.sh.in
branches/trac384/src/bin/xfrin/tests/Makefile.am
branches/trac384/src/bin/xfrout/run_b10-xfrout.sh.in
branches/trac384/src/bin/xfrout/tests/Makefile.am
branches/trac384/src/bin/zonemgr/run_b10-zonemgr.sh.in
branches/trac384/src/bin/zonemgr/tests/Makefile.am
branches/trac384/src/lib/asiolink/asiolink.cc
branches/trac384/src/lib/asiolink/asiolink.h
branches/trac384/src/lib/asiolink/internal/tcpdns.h
branches/trac384/src/lib/asiolink/tests/asiolink_unittest.cc
branches/trac384/src/lib/config/module_spec.cc
branches/trac384/src/lib/config/tests/module_spec_unittests.cc
branches/trac384/src/lib/config/tests/testdata/Makefile.am
branches/trac384/src/lib/config/tests/testdata/data22_8.data
branches/trac384/src/lib/datasrc/Makefile.am
branches/trac384/src/lib/datasrc/data_source.h
branches/trac384/src/lib/datasrc/memory_datasrc.cc
branches/trac384/src/lib/datasrc/memory_datasrc.h
branches/trac384/src/lib/datasrc/rbtree.h
branches/trac384/src/lib/datasrc/tests/memory_datasrc_unittest.cc
branches/trac384/src/lib/datasrc/tests/rbtree_unittest.cc
branches/trac384/src/lib/datasrc/tests/zonetable_unittest.cc
branches/trac384/src/lib/datasrc/zonetable.cc
branches/trac384/src/lib/datasrc/zonetable.h
branches/trac384/src/lib/dns/python/tests/Makefile.am
branches/trac384/src/lib/python/isc/cc/tests/Makefile.am
branches/trac384/src/lib/python/isc/config/ccsession.py
branches/trac384/src/lib/python/isc/config/config_data.py
branches/trac384/src/lib/python/isc/config/module_spec.py
branches/trac384/src/lib/python/isc/config/tests/Makefile.am
branches/trac384/src/lib/python/isc/config/tests/ccsession_test.py
branches/trac384/src/lib/python/isc/config/tests/config_data_test.py
branches/trac384/src/lib/python/isc/config/tests/module_spec_test.py
branches/trac384/src/lib/python/isc/datasrc/tests/Makefile.am
branches/trac384/src/lib/python/isc/log/tests/Makefile.am
branches/trac384/src/lib/python/isc/net/tests/Makefile.am
branches/trac384/src/lib/python/isc/notify/tests/Makefile.am
branches/trac384/src/lib/python/isc/util/tests/Makefile.am
branches/trac384/src/lib/testutils/testdata/Makefile.am
Modified: branches/trac384/ChangeLog
==============================================================================
--- branches/trac384/ChangeLog (original)
+++ branches/trac384/ChangeLog Mon Jan 3 13:47:41 2011
@@ -1,3 +1,67 @@
+ 142. [func] jinmei
+ b10-auth: updated query benchmark so that it can test in memory
+ data source. Also fixed a bug that the output buffer isn't
+ cleared after query processing, resulting in misleading results
+ or program crash. This is a regression due to change #135.
+ (Trac #465, svn r4103)
+
+ 141. [bug] jinmei
+ b10-auth: Fixed a bug that the authoritative server includes
+ trailing garbage data in responses. This is a regression due to
+ change #135. (Trac #462, svn r4081)
+
+ 140. [func] y-aharen
+ src/bin/auth: Added a feature to count queries and send counter
+ values to statistics periodically. To support it, added wrapping
+ class of asio::deadline_timer to use as interval timer.
+ The counters can be seen using the "Stats show" command from
+ bindctl. The result would look like:
+ ... "auth.queries.tcp": 1, "auth.queries.udp": 1 ...
+ Using the "Auth sendstats" command you can make b10-auth send the
+ counters to b10-stats immediately.
+ (Trac #347, svn r4026)
+
+ 139. [build] jreed
+ Introduced configure option and make targets for generating
+ Python code coverage report. This adds new make targets:
+ report-python-coverage and clean-python-coverage. The C++
+ code coverage targets were renamed to clean-cpp-coverage
+ and report-cpp-coverage. (Trac #362, svn r4023)
+
+ 138. [func]* jinmei
+ b10-auth: added a configuration interface to support in memory
+ data sources. For example, the following command to bindctl
+ will configure a memory data source containing the "example.com"
+ zone with the zone file named "example.com.zone":
+ > config set Auth/datasources/ [{"type": "memory", "zones": \
+ [{"origin": "example.com", "file": "example.com.zone"}]}]
+ By default, the memory data source is disabled; it must be
+ configured explicitly. To disable it again, specify a null list
+ for Auth/datasources:
+ > config set Auth/datasources/ []
+ Notes: it's currently for class IN only. The zone files are not
+ actually loaded into memory yet (which will soon be implemented).
+ This is an experimental feature and the syntax may change in
+ future versions.
+ (Trac #446, svn r3998)
+
+ 137. [bug] jreed
+ Fix run_*.sh scripts that are used for development testing
+ so they use a msgq socket file in the build tree.
+ (Trac #226, svn r3989)
+
+ 136. [bug] jelte
+ bindctl (and the configuration manager in general) now no longer
+ accepts 'unknown' data; i.e. data for modules that it does not know
+ about, or configuration items that are not specified in the .spec
+ files.
+ (Trac #202, svn r3967)
+
+ 135. [func] each
+ Add b10-recurse. This is an example recursive server that
+ currently does forwarding only and no caching.
+ (Trac #327, svn r3903)
+
134. [func] vorner
b10-recurse supports timeouts and retries in forwarder mode.
(Trac #401, svn r3660)
@@ -8,7 +72,7 @@
(Trac #393, r3602)
132. [func] vorner
- The b10-recursive is configured through config manager.
+ The b10-recurse is configured through config manager.
It has "listen_on" and "forward_addresses" options.
(Trac #389, r3448)
@@ -39,7 +103,6 @@
for root zone was added.
(Trac #85, svn r3836)
->>>>>>> .merge-right.r3894
127. [bug] stephen
During normal operation process termination and resurrection messages
are now output regardless of the state of the verbose flag.
Modified: branches/trac384/Makefile.am
==============================================================================
--- branches/trac384/Makefile.am (original)
+++ branches/trac384/Makefile.am Mon Jan 3 13:47:41 2011
@@ -8,20 +8,30 @@
# When running distcheck target, do not install the configurations
DISTCHECK_CONFIGURE_FLAGS = --disable-install-configurations
-clean-coverage:
+clean-cpp-coverage:
@if [ $(USE_LCOV) = yes ] ; then \
$(LCOV) --directory . --zerocounters; \
rm -rf coverage/; \
else \
- echo "Code coverage not enabled at configuration time"; \
- exit 1; \
+ echo "C++ code coverage not enabled at configuration time." ; \
+ echo "Use: ./configure --with-lcov" ; \
+ fi
+
+clean-python-coverage:
+ @if [ $(USE_PYCOVERAGE) = yes ] ; then \
+ rm -f $(abs_top_srcdir)/.coverage ; \
+ rm -rf $(abs_top_srcdir)/py-coverage-html ; \
+ else \
+ echo "Python code coverage not enabled at configuration time." ; \
+ echo "Use: ./configure --with-pycoverage" ; \
fi
perform-coverage: check
-report-coverage:
- $(LCOV) --capture --directory . --output-file all.info
- $(LCOV) --remove all.info \
+report-cpp-coverage:
+ @if [ $(USE_LCOV) = yes ] ; then \
+ $(LCOV) --capture --directory . --output-file all.info ; \
+ $(LCOV) --remove all.info \
c++/4.4\*/\* \
c++/4.4\*/backward/\* \
c++/4.4\*/bits/\* \
@@ -36,10 +46,29 @@
\*_unittests.cc \
\*_unittest.cc \
\*_unittests.h \
- --output report.info
- $(GENHTML) --legend -o coverage report.info
-
+ --output report.info ; \
+ $(GENHTML) --legend -o $(abs_top_builddir)/coverage-cpp-html report.info ; \
+ echo "Generated C++ Code Coverage report in HTML at $(abs_top_builddir)/coverage-cpp-html" ; \
+ else \
+ echo "C++ code coverage not enabled at configuration time." ; \
+ echo "Use: ./configure --with-lcov" ; \
+ fi
+
+report-python-coverage:
+ @if [ $(USE_PYCOVERAGE) = yes ] ; then \
+ $(PYCOVERAGE) html -d $(abs_top_builddir)/coverage-python-html --omit=src/bin/bind10/tests/,src/bin/bindctl/tests/,src/bin/cfgmgr/tests/,src/bin/cmdctl/tests/,src/bin/loadzone/tests/,src/bin/msgq/tests/,src/bin/stats/tests/,src/bin/tests/,src/bin/xfrin/tests/,src/bin/xfrout/tests/,src/bin/zonemgr/tests/,src/lib/dns/python/tests/,src/lib/dns/tests/,src/lib/python/isc/cc/tests/,src/lib/python/isc/config/tests/,src/lib/python/isc/datasrc/tests/,src/lib/python/isc/log/tests/,src/lib/python/isc/net/tests/,src/lib/python/isc/notify/tests/,src/lib/python/isc/util/tests/ ; \
+ echo "Generated Python Code Coverage report in HTML at $(abs_top_builddir)/coverage-python-html" ; \
+ else \
+ echo "Python code coverage not enabled at configuration time." ; \
+ echo "Use: ./configure --with-pycoverage" ; \
+ fi
+
+# for python and c++ test coverage
coverage: clean-coverage perform-coverage report-coverage
+
+clean-coverage: clean-cpp-coverage clean-python-coverage
+
+report-coverage: report-cpp-coverage report-python-coverage
#### include external sources in the distributed tarball:
EXTRA_DIST = ext/asio/README
Modified: branches/trac384/README
==============================================================================
--- branches/trac384/README (original)
+++ branches/trac384/README Mon Jan 3 13:47:41 2011
@@ -15,11 +15,11 @@
This release includes the bind10 master process, b10-msgq message
bus, b10-auth authoritative DNS server (with SQLite3 backend),
-b10-cmdctl remote control daemon, b10-cfgmgr configuration manager,
-b10-xfrin AXFR inbound service, b10-xfrout outgoing AXFR service,
-b10-zonemgr secondary manager, b10-stats statistics collection and
-reporting daemon, and a new libdns++ library for C++ with a python
-wrapper.
+b10-recurse forwarding DNS server, b10-cmdctl remote control daemon,
+b10-cfgmgr configuration manager, b10-xfrin AXFR inbound service,
+b10-xfrout outgoing AXFR service, b10-zonemgr secondary manager,
+b10-stats statistics collection and reporting daemon, and a new
+libdns++ library for C++ with a python wrapper.
Documentation is included and also available via the BIND 10
website at http://bind10.isc.org/
@@ -93,26 +93,55 @@
TEST COVERAGE
+Code coverage reports may be generated using make. These are
+based on running on the unit tests. The resulting reports are placed
+in coverage-cpp-html and coverage-python-html directories for C++
+and Python, respectively.
+
The code coverage report for the C++ tests uses LCOV. It is available
-from http://ltp.sourceforge.net/. To generate your own HTML report,
+from http://ltp.sourceforge.net/. To generate the HTML report,
first configure BIND 10 with:
./configure --with-lcov
+The code coverage report for the Python tests uses coverage.py (aka
+pycoverage). It is available from http://nedbatchelder.com/code/coverage/.
+To generate the HTML report, first configure BIND 10 with:
+
+ ./configure --with-pycoverage
+
Doing code coverage tests:
make coverage
- Does the following:
+ Does the clean, perform, and report targets for C++ and Python.
make clean-coverage
- Zeroes the lcov code coverage counters and removes the coverage HTML.
+ Zeroes the code coverage counters and removes the HTML reports
+ for C++ and Python.
make perform-coverage
- Runs the C++ tests (using googletests framework).
+ Runs the C++ (using the googletests framework) and Python
+ tests.
make report-coverage
- Generates the coverage HTML, excluding some unrelated headers.
- The HTML reports are placed in a directory called coverage/.
+ Generates the coverage reports in HTML for C++ and Python.
+
+ make clean-cpp-coverage
+ Zeroes the code coverage counters and removes the HTML report
+ for the C++ tests.
+
+ make clean-python-coverage
+ Zeroes the code coverage counters and removes the HTML report
+ for the Python tests.
+
+ make report-cpp-coverage
+ Generates the coverage report in HTML for C++, excluding
+ some unrelated headers. The HTML reports are placed in a
+ directory called coverage-cpp-html/.
+
+ make report-python-coverage
+ Generates the coverage report in HTML for Python. The HTML
+ reports are placed in a directory called coverage-python-html/.
DEVELOPERS
Modified: branches/trac384/configure.ac
==============================================================================
--- branches/trac384/configure.ac (original)
+++ branches/trac384/configure.ac Mon Jan 3 13:47:41 2011
@@ -287,6 +287,26 @@
AC_DEFINE(HAVE_SA_LEN, 1, [Define to 1 if sockaddr has a sa_len member, and corresponding sin_len and sun_len])],
AC_MSG_RESULT(no))
+AC_ARG_WITH(pycoverage,
+[ --with-pycoverage[=PROGRAM] enable python code coverage using the specified coverage], pycoverage="$withval", pycoverage="no")
+if test "$pycoverage" = "no" ; then
+ # just run the tests normally with python
+ PYCOVERAGE_RUN="${PYTHON}"
+ USE_PYCOVERAGE="no"
+elif test "$pycoverage" = "yes" ; then
+ PYCOVERAGE="coverage"
+ PYCOVERAGE_RUN="${PYCOVERAGE} run --branch --append"
+ USE_PYCOVERAGE="yes"
+else
+ PYCOVERAGE="$pycoverage"
+ PYCOVERAGE_RUN="${PYCOVERAGE} run --branch --append"
+ USE_PYCOVERAGE="yes"
+fi
+AM_CONDITIONAL(ENABLE_PYTHON_COVERAGE, test x$USE_PYCOVERAGE != xno)
+AC_SUBST(PYCOVERAGE)
+AC_SUBST(PYCOVERAGE_RUN)
+AC_SUBST(USE_PYCOVERAGE)
+
AC_ARG_WITH(lcov,
[ --with-lcov[=PROGRAM] enable gtest and coverage target using the specified lcov], lcov="$withval", lcov="no")
@@ -351,7 +371,7 @@
BOOST_INCLUDES="-I${boost_include_path}"
CPPFLAGS="$CPPFLAGS $BOOST_INCLUDES"
fi
-AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp],,
+AC_CHECK_HEADERS([boost/shared_ptr.hpp boost/foreach.hpp boost/interprocess/sync/interprocess_upgradable_mutex.hpp boost/date_time/posix_time/posix_time_types.hpp boost/bind.hpp boost/function.hpp],,
AC_MSG_ERROR([Missing required header files.]))
CPPFLAGS="$CPPFLAGS_SAVES"
AC_SUBST(BOOST_INCLUDES)
@@ -729,7 +749,8 @@
Developer:
Google Tests: $gtest_path
- Code Coverage: $USE_LCOV
+ C++ Code Coverage: $USE_LCOV
+ Python Code Coverage: $USE_PYCOVERAGE
Generate Manuals: $enable_man
END
Modified: branches/trac384/doc/guide/bind10-guide.xml
==============================================================================
--- branches/trac384/doc/guide/bind10-guide.xml (original)
+++ branches/trac384/doc/guide/bind10-guide.xml Mon Jan 3 13:47:41 2011
@@ -42,9 +42,8 @@
<note>
<para>
- BIND 10, at this time, does not provide a recursive
- DNS server. It does provide a EDNS0- and DNSSEC-capable
- authoritative DNS server.
+ BIND 10 provides a EDNS0- and DNSSEC-capable
+ authoritative DNS server and a forwarding DNS server.
</para>
</note>
Modified: branches/trac384/src/bin/auth/Makefile.am
==============================================================================
--- branches/trac384/src/bin/auth/Makefile.am (original)
+++ branches/trac384/src/bin/auth/Makefile.am Mon Jan 3 13:47:41 2011
@@ -34,12 +34,14 @@
spec_config.h: spec_config.h.pre
$(SED) -e "s|@@LOCALSTATEDIR@@|$(localstatedir)|" spec_config.h.pre >$@
-BUILT_SOURCES = spec_config.h
+BUILT_SOURCES = spec_config.h
pkglibexec_PROGRAMS = b10-auth
-b10_auth_SOURCES = auth_srv.cc auth_srv.h
-b10_auth_SOURCES += query.cc query.h
+b10_auth_SOURCES = query.cc query.h
+b10_auth_SOURCES += auth_srv.cc auth_srv.h
b10_auth_SOURCES += change_user.cc change_user.h
+b10_auth_SOURCES += config.cc config.h
b10_auth_SOURCES += common.h
+b10_auth_SOURCES += statistics.cc statistics.h
b10_auth_SOURCES += main.cc
b10_auth_LDADD = $(top_builddir)/src/lib/datasrc/libdatasrc.la
b10_auth_LDADD += $(top_builddir)/src/lib/dns/libdns++.la
Modified: branches/trac384/src/bin/auth/auth.spec.pre.in
==============================================================================
--- branches/trac384/src/bin/auth/auth.spec.pre.in (original)
+++ branches/trac384/src/bin/auth/auth.spec.pre.in Mon Jan 3 13:47:41 2011
@@ -8,62 +8,48 @@
"item_optional": true,
"item_default": "@@LOCALSTATEDIR@@/@PACKAGE@/zone.sqlite3"
},
- {
- "item_name": "list",
+ { "item_name": "datasources",
"item_type": "list",
"item_optional": true,
"item_default": [],
- "list_item_spec": {
- "item_name": "value",
- "item_type": "map",
+ "list_item_spec":
+ { "item_name": "list_element",
+ "item_type": "map",
+ "item_optional": false,
+ "item_default": {},
+ "map_item_spec": [
+ { "item_name": "type",
+ "item_type": "string",
"item_optional": false,
- "item_default": {},
- "map_item_spec":
- [{
- "item_name": "number",
- "item_type": "integer",
- "item_optional": false,
- "item_default": 1
- },
- {
- "item_name": "name",
- "item_type": "string",
- "item_optional": false,
- "item_default": ""
- }]
+ "item_default": ""
+ },
+ { "item_name": "class",
+ "item_type": "string",
+ "item_optional": false,
+ "item_default": "IN"
+ },
+ { "item_name": "zones",
+ "item_type": "list",
+ "item_optional": false,
+ "item_default": [],
+ "list_item_spec":
+ { "item_name": "list_element",
+ "item_type": "map",
+ "item_optional": true,
+ "map_item_spec": [
+ { "item_name": "origin",
+ "item_type": "string",
+ "item_optional": false,
+ "item_default": ""
+ },
+ { "item_name": "file",
+ "item_type": "string",
+ "item_optional": false,
+ "item_default": ""
+ }]
+ }
+ }]
}
- },
- {
- "item_name": "map",
- "item_type": "map",
- "item_optional": false,
- "item_default": {},
- "map_item_spec":
- [{
- "item_name": "number",
- "item_type": "integer",
- "item_optional": false,
- "item_default": 1
- },
- {
- "item_name": "name",
- "item_type": "string",
- "item_optional": false,
- "item_default": ""
- },
- {
- "item_name": "list",
- "item_type": "list",
- "item_optional": false,
- "item_default": [],
- "list_item_spec": {
- "item_name": "value",
- "item_type": "integer",
- "item_optional": false,
- "item_default": 1
- }
- }
- ]
}
],
"commands": [
@@ -71,6 +57,11 @@
"command_name": "shutdown",
"command_description": "Shut down authoritative DNS server",
"command_args": []
+ },
+ {
+ "command_name": "sendstats",
+ "command_description": "Send data to a statistics module at once",
+ "command_args": []
}
]
}
Modified: branches/trac384/src/bin/auth/auth_srv.cc
==============================================================================
--- branches/trac384/src/bin/auth/auth_srv.cc (original)
+++ branches/trac384/src/bin/auth/auth_srv.cc Mon Jan 3 13:47:41 2011
@@ -45,13 +45,17 @@
#include <datasrc/query.h>
#include <datasrc/data_source.h>
+#include <datasrc/memory_datasrc.h>
#include <datasrc/static_datasrc.h>
#include <datasrc/sqlite3_datasrc.h>
#include <xfr/xfrout_client.h>
#include <auth/common.h>
+#include <auth/config.h>
#include <auth/auth_srv.h>
+#include <auth/query.h>
+#include <auth/statistics.h>
using namespace std;
@@ -59,6 +63,7 @@
using namespace isc::cc;
using namespace isc::datasrc;
using namespace isc::dns;
+using namespace isc::auth;
using namespace isc::dns::rdata;
using namespace isc::data;
using namespace isc::config;
@@ -90,8 +95,15 @@
bool verbose_mode_;
AbstractSession* xfrin_session_;
+ /// In-memory data source. Currently class IN only for simplicity.
+ const RRClass memory_datasrc_class_;
+ AuthSrv::MemoryDataSrcPtr memory_datasrc_;
+
/// Hot spot cache
isc::datasrc::HotCache cache_;
+
+ /// Query counters for statistics
+ AuthCounters counters_;
private:
std::string db_file_;
@@ -103,12 +115,17 @@
bool xfrout_connected_;
AbstractXfroutClient& xfrout_client_;
+
+ /// Increment query counter
+ void incCounter(const int protocol);
};
AuthSrvImpl::AuthSrvImpl(const bool use_cache,
AbstractXfroutClient& xfrout_client) :
config_session_(NULL), verbose_mode_(false),
xfrin_session_(NULL),
+ memory_datasrc_class_(RRClass::IN()),
+ counters_(verbose_mode_),
xfrout_connected_(false),
xfrout_client_(xfrout_client)
{
@@ -145,33 +162,20 @@
AuthSrv* server_;
};
-// This is a derived class of \c DNSAnswer, to serve as a
-// callback in the asiolink module. It takes a completed
-// set of answer data from the DNS lookup and assembles it
-// into a wire-format response.
+// This is a derived class of \c DNSAnswer, to serve as a callback in the
+// asiolink module. We actually shouldn't do anything in this class because
+// we build complete response messages in the process methods; otherwise
+// the response message will contain trailing garbage. In future, we should
+// probably even drop the reliance on DNSAnswer. We don't need the coroutine
+// tricks provided in that framework, and its overhead would be significant
+// in terms of performance consideration for the authoritative server
+// implementation.
class MessageAnswer : public DNSAnswer {
public:
- MessageAnswer(AuthSrv* srv) : server_(srv) {}
- virtual void operator()(const IOMessage& io_message, MessagePtr message,
- OutputBufferPtr buffer) const
- {
- MessageRenderer renderer(*buffer);
- if (io_message.getSocket().getProtocol() == IPPROTO_UDP) {
- ConstEDNSPtr edns(message->getEDNS());
- renderer.setLengthLimit(edns ? edns->getUDPSize() :
- Message::DEFAULT_MAX_UDPSIZE);
- } else {
- renderer.setLengthLimit(65535);
- }
- message->toWire(renderer);
- if (server_->getVerbose()) {
- cerr << "[b10-auth] sending a response (" << renderer.getLength()
- << " bytes):\n" << message->toText() << endl;
- }
- }
-
-private:
- AuthSrv* server_;
+ MessageAnswer(AuthSrv*) {}
+ virtual void operator()(const IOMessage&, MessagePtr,
+ OutputBufferPtr) const
+ {}
};
// This is a derived class of \c SimpleCallback, to serve
@@ -285,9 +289,47 @@
impl_->config_session_ = config_session;
}
+void
+AuthSrv::setStatisticsSession(AbstractSession* statistics_session) {
+ impl_->counters_.setStatisticsSession(statistics_session);
+}
+
ModuleCCSession*
AuthSrv::getConfigSession() const {
return (impl_->config_session_);
+}
+
+AuthSrv::ConstMemoryDataSrcPtr
+AuthSrv::getMemoryDataSrc(const RRClass& rrclass) const {
+ // XXX: for simplicity, we only support the IN class right now.
+ if (rrclass != impl_->memory_datasrc_class_) {
+ isc_throw(InvalidParameter,
+ "Memory data source is not supported for RR class "
+ << rrclass);
+ }
+ return (impl_->memory_datasrc_);
+}
+
+void
+AuthSrv::setMemoryDataSrc(const isc::dns::RRClass& rrclass,
+ MemoryDataSrcPtr memory_datasrc)
+{
+ // XXX: see above
+ if (rrclass != impl_->memory_datasrc_class_) {
+ isc_throw(InvalidParameter,
+ "Memory data source is not supported for RR class "
+ << rrclass);
+ }
+ if (impl_->verbose_mode_) {
+ if (!impl_->memory_datasrc_ && memory_datasrc) {
+ cerr << "[b10-auth] Memory data source is enabled for class "
+ << rrclass << endl;
+ } else if (impl_->memory_datasrc_ && !memory_datasrc) {
+ cerr << "[b10-auth] Memory data source is disabled for class "
+ << rrclass << endl;
+ }
+ }
+ impl_->memory_datasrc_ = memory_datasrc;
}
void
@@ -387,6 +429,9 @@
message->setHeaderFlag(Message::HEADERFLAG_AA);
message->setRcode(Rcode::NOERROR());
+ // Increment query counter.
+ incCounter(io_message.getSocket().getProtocol());
+
if (remote_edns) {
EDNSPtr local_edns = EDNSPtr(new EDNS());
local_edns->setDNSSECAwareness(dnssec_ok);
@@ -395,8 +440,17 @@
}
try {
- Query query(*message, cache_, dnssec_ok);
- data_sources_.doQuery(query);
+ // If a memory data source is configured call the separate
+ // Query::process()
+ const ConstQuestionPtr question = *message->beginQuestion();
+ if (memory_datasrc_ && memory_datasrc_class_ == question->getClass()) {
+ const RRType& qtype = question->getType();
+ const Name& qname = question->getName();
+ auth::Query(*memory_datasrc_, qname, qtype, *message).process();
+ } else {
+ datasrc::Query query(*message, cache_, dnssec_ok);
+ data_sources_.doQuery(query);
+ }
} catch (const Exception& ex) {
if (verbose_mode_) {
cerr << "[b10-auth] Internal error, returning SERVFAIL: " <<
@@ -405,7 +459,6 @@
makeErrorMessage(message, buffer, Rcode::SERVFAIL(), verbose_mode_);
return (true);
}
-
MessageRenderer renderer(*buffer);
const bool udp_buffer =
@@ -426,6 +479,9 @@
AuthSrvImpl::processAxfrQuery(const IOMessage& io_message, MessagePtr message,
OutputBufferPtr buffer)
{
+ // Increment query counter.
+ incCounter(io_message.getSocket().getProtocol());
+
if (io_message.getSocket().getProtocol() == IPPROTO_UDP) {
if (verbose_mode_) {
cerr << "[b10-auth] AXFR query over UDP isn't allowed" << endl;
@@ -551,6 +607,19 @@
return (true);
}
+void
+AuthSrvImpl::incCounter(const int protocol) {
+ // Increment query counter.
+ if (protocol == IPPROTO_UDP) {
+ counters_.inc(AuthCounters::COUNTER_UDP_QUERY);
+ } else if (protocol == IPPROTO_TCP) {
+ counters_.inc(AuthCounters::COUNTER_TCP_QUERY);
+ } else {
+ // unknown protocol
+ isc_throw(Unexpected, "Unknown protocol: " << protocol);
+ }
+}
+
ConstElementPtr
AuthSrvImpl::setDbFile(ConstElementPtr config) {
ConstElementPtr answer = isc::config::createAnswer();
@@ -609,6 +678,9 @@
try {
// the ModuleCCSession has already checked if we have
// the correct ElementPtr type as specified in our .spec file
+ if (new_config) {
+ configureAuthServer(*this, new_config);
+ }
return (impl_->setDbFile(new_config));
} catch (const isc::Exception& error) {
if (impl_->verbose_mode_) {
@@ -617,3 +689,12 @@
return (isc::config::createAnswer(1, error.what()));
}
}
+
+bool AuthSrv::submitStatistics() const {
+ return (impl_->counters_.submitStatistics());
+}
+
+uint64_t
+AuthSrv::getCounter(const AuthCounters::CounterType type) const {
+ return (impl_->counters_.getCounter(type));
+}
Modified: branches/trac384/src/bin/auth/auth_srv.h
==============================================================================
--- branches/trac384/src/bin/auth/auth_srv.h (original)
+++ branches/trac384/src/bin/auth/auth_srv.h Mon Jan 3 13:47:41 2011
@@ -19,16 +19,25 @@
#include <string>
+// For MemoryDataSrcPtr below. This should be a temporary definition until
+// we reorganize the data source framework.
+#include <boost/shared_ptr.hpp>
+
#include <cc/data.h>
#include <config/ccsession.h>
#include <asiolink/asiolink.h>
+#include <auth/statistics.h>
namespace isc {
+namespace datasrc {
+class MemoryDataSrc;
+}
namespace xfr {
class AbstractXfroutClient;
}
}
+
/// \brief The implementation class for the \c AuthSrv class using the pimpl
/// idiom.
@@ -54,6 +63,7 @@
///
/// The design of this class is still in flux. It's quite likely to change
/// in future versions.
+///
class AuthSrv {
///
/// \name Constructors, Assignment Operator and Destructor.
@@ -88,6 +98,8 @@
/// \param message Pointer to the \c Message object
/// \param buffer Pointer to an \c OutputBuffer for the resposne
/// \param server Pointer to the \c DNSServer
+ ///
+ /// \throw isc::Unexpected Protocol type of \a message is unexpected
void processMessage(const asiolink::IOMessage& io_message,
isc::dns::MessagePtr message,
isc::dns::OutputBufferPtr buffer,
@@ -123,9 +135,11 @@
/// If there is a data source installed, it will be replaced with the
/// new one.
///
- /// In the current implementation, the SQLite data source is assumed.
- /// The \c config parameter will simply be passed to the initialization
- /// routine of the \c Sqlite3DataSrc class.
+ /// In the current implementation, the SQLite data source and MemoryDataSrc
+ /// are assumed.
+ /// We can enable memory data source and get the path of SQLite database by
+ /// the \c config parameter. If we disabled memory data source, the SQLite
+ /// data source will be used.
///
/// On success this method returns a data \c Element (in the form of a
/// pointer like object) indicating the successful result,
@@ -224,6 +238,96 @@
///
void setXfrinSession(isc::cc::AbstractSession* xfrin_session);
+ /// A shared pointer type for \c MemoryDataSrc.
+ ///
+ /// This is defined inside the \c AuthSrv class as it's supposed to be
+ /// a short term interface until we integrate the in-memory and other
+ /// data source frameworks.
+ typedef boost::shared_ptr<isc::datasrc::MemoryDataSrc> MemoryDataSrcPtr;
+
+ /// An immutable shared pointer type for \c MemoryDataSrc.
+ typedef boost::shared_ptr<const isc::datasrc::MemoryDataSrc>
+ ConstMemoryDataSrcPtr;
+
+ /// Returns the in-memory data source configured for the \c AuthSrv,
+ /// if any.
+ ///
+ /// The in-memory data source is configured per RR class. However,
+ /// the data source may not be available for all RR classes.
+ /// If it is not available for the specified RR class, an exception of
+ /// class \c InvalidParameter will be thrown.
+ /// This method never throws an exception otherwise.
+ ///
+ /// Even for supported RR classes, the in-memory data source is not
+ /// configured by default. In that case a NULL (shared) pointer will
+ /// be returned.
+ ///
+ /// \param rrclass The RR class of the requested in-memory data source.
+ /// \return A pointer to the in-memory data source, if configured;
+ /// otherwise NULL.
+ ConstMemoryDataSrcPtr
+ getMemoryDataSrc(const isc::dns::RRClass& rrclass) const;
+
+ /// Sets or replaces the in-memory data source of the specified RR class.
+ ///
+ /// As noted in \c getMemoryDataSrc(), some RR classes may not be
+ /// supported, in which case an exception of class \c InvalidParameter
+ /// will be thrown.
+ /// This method never throws an exception otherwise.
+ ///
+ /// If there is already an in memory data source configured, it will be
+ /// replaced with the newly specified one.
+ /// \c memory_datasrc can be NULL, in which case it will (re)disable the
+ /// in-memory data source.
+ ///
+ /// \param rrclass The RR class of the in-memory data source to be set.
+ /// \param memory_datasrc A (shared) pointer to \c MemoryDataSrc to be set.
+ void setMemoryDataSrc(const isc::dns::RRClass& rrclass,
+ MemoryDataSrcPtr memory_datasrc);
+
+ /// \brief Set the communication session with Statistics.
+ ///
+ /// This function never throws an exception as far as
+ /// AuthCounters::setStatisticsSession() doesn't throw.
+ ///
+ /// Note: this interface is tentative. We'll revisit the ASIO and
+ /// session frameworks, at which point the session will probably
+ /// be passed on construction of the server.
+ ///
+ /// \param statistics_session A Session object over which statistics
+ /// information is exchanged with statistics module.
+ /// The session must be established before setting in the server
+ /// object.
+ /// Ownership isn't transferred: the caller is responsible for keeping
+ /// this object to be valid while the server object is working and for
+ /// disconnecting the session and destroying the object when the server
+ /// is shutdown.
+ void setStatisticsSession(isc::cc::AbstractSession* statistics_session);
+
+ /// \brief Submit statistics counters to statistics module.
+ ///
+ /// This function can throw an exception from
+ /// AuthCounters::submitStatistics().
+ ///
+ /// \return true on success, false on failure (e.g. session timeout,
+ /// session error).
+ bool submitStatistics() const;
+
+ /// \brief Get the value of counter in the AuthCounters.
+ ///
+ /// This function calls AuthCounters::getCounter() and
+ /// returns its return value.
+ ///
+ /// This function never throws an exception as far as
+ /// AuthCounters::getCounter() doesn't throw.
+ ///
+ /// Note: Currently this function is for testing purpose only.
+ ///
+ /// \param type Type of a counter to get the value of
+ ///
+ /// \return the value of the counter.
+ uint64_t getCounter(const AuthCounters::CounterType type) const;
+
private:
AuthSrvImpl* impl_;
asiolink::IOService* io_service_;
Modified: branches/trac384/src/bin/auth/benchmarks/Makefile.am
==============================================================================
--- branches/trac384/src/bin/auth/benchmarks/Makefile.am (original)
+++ branches/trac384/src/bin/auth/benchmarks/Makefile.am Mon Jan 3 13:47:41 2011
@@ -8,7 +8,10 @@
noinst_PROGRAMS = query_bench
query_bench_SOURCES = query_bench.cc
+query_bench_SOURCES += ../query.h ../query.cc
query_bench_SOURCES += ../auth_srv.h ../auth_srv.cc
+query_bench_SOURCES += ../config.h ../config.cc
+query_bench_SOURCES += ../statistics.h ../statistics.cc
query_bench_LDADD = $(top_builddir)/src/lib/dns/libdns++.la
query_bench_LDADD += $(top_builddir)/src/lib/exceptions/libexceptions.la
Modified: branches/trac384/src/bin/auth/benchmarks/query_bench.cc
==============================================================================
--- branches/trac384/src/bin/auth/benchmarks/query_bench.cc (original)
+++ branches/trac384/src/bin/auth/benchmarks/query_bench.cc Mon Jan 3 13:47:41 2011
@@ -33,11 +33,15 @@
#include <xfr/xfrout_client.h>
#include <auth/auth_srv.h>
+#include <auth/config.h>
+#include <auth/query.h>
+
#include <asiolink/asiolink.h>
using namespace std;
using namespace isc;
using namespace isc::data;
+using namespace isc::auth;
using namespace isc::dns;
using namespace isc::xfr;
using namespace isc::bench;
@@ -50,24 +54,25 @@
// Just something to pass as the server to resume
class DummyServer : public DNSServer {
public:
- virtual void operator()(asio::error_code, size_t) { }
- virtual void resume(const bool) { }
+ virtual void operator()(asio::error_code, size_t) {}
+ virtual void resume(const bool) {}
virtual DNSServer* clone() {
- return new DummyServer(*this);
+ return (new DummyServer(*this));
}
};
class QueryBenchMark {
-private:
+protected:
// Maintain dynamically generated objects via shared pointers because
// QueryBenchMark objects will be copied.
typedef boost::shared_ptr<AuthSrv> AuthSrvPtr;
+private:
typedef boost::shared_ptr<const IOEndpoint> IOEndpointPtr;
-public:
- QueryBenchMark(const int cache_slots, const char* const datasrc_file,
+protected:
+ QueryBenchMark(const bool enable_cache,
const BenchQueries& queries, MessagePtr query_message,
OutputBufferPtr buffer) :
- server_(new AuthSrv(cache_slots >= 0 ? true : false, xfrout_client)),
+ server_(new AuthSrv(enable_cache, xfrout_client)),
queries_(queries),
query_message_(query_message),
buffer_(buffer),
@@ -75,13 +80,8 @@
dummy_endpoint(IOEndpointPtr(IOEndpoint::create(IPPROTO_UDP,
IOAddress("192.0.2.1"),
5300)))
- {
- if (cache_slots >= 0) {
- server_->setCacheSlots(cache_slots);
- }
- server_->updateConfig(Element::fromJSON("{\"database_file\": \"" +
- string(datasrc_file) + "\"}"));
- }
+ {}
+public:
unsigned int run() {
BenchQueries::const_iterator query;
const BenchQueries::const_iterator query_end = queries_.end();
@@ -90,14 +90,16 @@
IOMessage io_message(&(*query)[0], (*query).size(), dummy_socket,
*dummy_endpoint);
query_message_->clear(Message::PARSE);
+ buffer_->clear();
server_->processMessage(io_message, query_message_, buffer_,
- &server);
+ &server);
}
return (queries_.size());
}
+protected:
+ AuthSrvPtr server_;
private:
- AuthSrvPtr server_;
const BenchQueries& queries_;
MessagePtr query_message_;
OutputBufferPtr buffer_;
@@ -105,26 +107,92 @@
IOEndpointPtr dummy_endpoint;
};
+class Sqlite3QueryBenchMark : public QueryBenchMark {
+public:
+ Sqlite3QueryBenchMark(const int cache_slots,
+ const char* const datasrc_file,
+ const BenchQueries& queries,
+ MessagePtr query_message,
+ OutputBufferPtr buffer) :
+ QueryBenchMark(cache_slots >= 0 ? true : false, queries,
+ query_message, buffer)
+ {
+ if (cache_slots >= 0) {
+ server_->setCacheSlots(cache_slots);
+ }
+ server_->updateConfig(Element::fromJSON("{\"database_file\": \"" +
+ string(datasrc_file) + "\"}"));
+ }
+};
+
+class MemoryQueryBenchMark : public QueryBenchMark {
+public:
+ MemoryQueryBenchMark(const char* const zone_file,
+ const char* const zone_origin,
+ const BenchQueries& queries,
+ MessagePtr query_message,
+ OutputBufferPtr buffer) :
+ QueryBenchMark(false, queries, query_message, buffer)
+ {
+ configureAuthServer(*server_,
+ Element::fromJSON(
+ "{\"datasources\": "
+ " [{\"type\": \"memory\","
+ " \"zones\": [{\"origin\": \"" +
+ string(zone_origin) + "\","
+ " \"file\": \"" +
+ string(zone_file) + "\"}]}]}"));
+ }
+};
+
+void
+printQPSResult(unsigned int iteration, double duration,
+ double iteration_per_second)
+{
+ cout.precision(6);
+ cout << "Processed " << iteration << " queries in "
+ << fixed << duration << "s";
+ cout.precision(2);
+ cout << " (" << fixed << iteration_per_second << "qps)" << endl;
+}
}
namespace isc {
namespace bench {
template<>
void
-BenchMark<QueryBenchMark>::printResult() const {
- cout.precision(6);
- cout << "Processed " << getIteration() << " queries in "
- << fixed << getDuration() << "s";
- cout.precision(2);
- cout << " (" << fixed << getIterationPerSecond() << "qps)" << endl;
+BenchMark<Sqlite3QueryBenchMark>::printResult() const {
+ printQPSResult(getIteration(), getDuration(), getIterationPerSecond());
+}
+
+template<>
+void
+BenchMark<MemoryQueryBenchMark>::printResult() const {
+ printQPSResult(getIteration(), getDuration(), getIterationPerSecond());
}
}
}
namespace {
+const int ITERATION_DEFAULT = 1;
+enum DataSrcType {
+ SQLITE3,
+ MEMORY
+};
+
void
usage() {
- cerr << "Usage: query_bench [-n iterations] datasrc_file query_datafile"
+ cerr <<
+ "Usage: query_bench [-n iterations] [-t datasrc_type] [-o origin] "
+ "datasrc_file query_datafile\n"
+ " -n Number of iterations per test case (default: "
+ << ITERATION_DEFAULT << ")\n"
+ " -t Type of data source: sqlite3|memory (default: sqlite3)\n"
+ " -o Origin name of datasrc_file necessary for \"memory\", "
+ "ignored for others\n"
+ " datasrc_file: sqlite3 DB file for \"sqlite3\", "
+ "textual master file for \"memory\" datasrc\n"
+ " query_datafile: queryperf style input data"
<< endl;
exit (1);
}
@@ -133,12 +201,20 @@
int
main(int argc, char* argv[]) {
int ch;
- int iteration = 1;
- while ((ch = getopt(argc, argv, "n:")) != -1) {
+ int iteration = ITERATION_DEFAULT;
+ const char* opt_datasrc_type = "sqlite3";
+ const char* origin = NULL;
+ while ((ch = getopt(argc, argv, "n:t:o:")) != -1) {
switch (ch) {
case 'n':
iteration = atoi(optarg);
break;
+ case 't':
+ opt_datasrc_type = optarg;
+ break;
+ case 'o':
+ origin = optarg;
+ break;
case '?':
default:
usage();
@@ -152,6 +228,21 @@
const char* const datasrc_file = argv[0];
const char* const query_data_file = argv[1];
+ DataSrcType datasrc_type = SQLITE3;
+ if (strcmp(opt_datasrc_type, "sqlite3") == 0) {
+ ; // no need to override
+ } else if (strcmp(opt_datasrc_type, "memory") == 0) {
+ datasrc_type = MEMORY;
+ } else {
+ cerr << "Unknown data source type: " << datasrc_type << endl;
+ return (1);
+ }
+
+ if (datasrc_type == MEMORY && origin == NULL) {
+ cerr << "'-o Origin' is missing for memory data source " << endl;
+ return (1);
+ }
+
BenchQueries queries;
loadQueryData(query_data_file, queries, RRClass::IN());
OutputBufferPtr buffer(new OutputBuffer(4096));
@@ -159,32 +250,46 @@
cout << "Parameters:" << endl;
cout << " Iterations: " << iteration << endl;
- cout << " Data Source: " << datasrc_file << endl;
+ cout << " Data Source: type=" << opt_datasrc_type << ", file=" <<
+ datasrc_file << endl;
+ if (origin != NULL) {
+ cout << " Origin: " << origin << endl;
+ }
cout << " Query data: file=" << query_data_file << " (" << queries.size()
<< " queries)" << endl << endl;
- cout << "Benchmark enabling Hot Spot Cache with unlimited slots "
- << endl;
- BenchMark<QueryBenchMark>(iteration,
- QueryBenchMark(0, datasrc_file, queries, message,
- buffer));
-
- cout << "Benchmark enabling Hot Spot Cache with 10*#queries slots "
- << endl;
- BenchMark<QueryBenchMark>(iteration,
- QueryBenchMark(10 * queries.size(), datasrc_file,
+ switch (datasrc_type) {
+ case SQLITE3:
+ cout << "Benchmark enabling Hot Spot Cache with unlimited slots "
+ << endl;
+ BenchMark<Sqlite3QueryBenchMark>(
+ iteration, Sqlite3QueryBenchMark(0, datasrc_file, queries,
+ message, buffer));
+
+ cout << "Benchmark enabling Hot Spot Cache with 10*#queries slots "
+ << endl;
+ BenchMark<Sqlite3QueryBenchMark>(
+ iteration, Sqlite3QueryBenchMark(10 * queries.size(), datasrc_file,
queries, message, buffer));
- cout << "Benchmark enabling Hot Spot Cache with #queries/2 slots "
- << endl;
- BenchMark<QueryBenchMark>(iteration,
- QueryBenchMark(queries.size() / 2, datasrc_file,
+ cout << "Benchmark enabling Hot Spot Cache with #queries/2 slots "
+ << endl;
+ BenchMark<Sqlite3QueryBenchMark>(
+ iteration, Sqlite3QueryBenchMark(queries.size() / 2, datasrc_file,
queries, message, buffer));
- cout << "Benchmark disabling Hot Spot Cache" << endl;
- BenchMark<QueryBenchMark>(iteration,
- QueryBenchMark(-1, datasrc_file, queries,
- message, buffer));
+ cout << "Benchmark disabling Hot Spot Cache" << endl;
+ BenchMark<Sqlite3QueryBenchMark>(
+ iteration, Sqlite3QueryBenchMark(-1, datasrc_file, queries,
+ message, buffer));
+ break;
+ case MEMORY:
+ cout << "Benchmark with In Memory Data Source" << endl;
+ BenchMark<MemoryQueryBenchMark>(
+ iteration, MemoryQueryBenchMark(datasrc_file, origin, queries,
+ message, buffer));
+ break;
+ }
return (0);
}
Modified: branches/trac384/src/bin/auth/change_user.cc
==============================================================================
--- branches/trac384/src/bin/auth/change_user.cc (original)
+++ branches/trac384/src/bin/auth/change_user.cc Mon Jan 3 13:47:41 2011
@@ -26,6 +26,7 @@
#include <auth/common.h>
using namespace boost;
+using namespace std;
void
changeUser(const char* const username) {
@@ -42,14 +43,14 @@
}
}
if (runas_pw == NULL) {
- isc_throw(FatalError, "Unknown user name or UID:" << username);
+ throw FatalError("Unknown user name or UID:" + string(username));
}
if (setgid(runas_pw->pw_gid) < 0) {
- isc_throw(FatalError, "setgid() failed: " << strerror(errno));
+ throw FatalError("setgid() failed: " + string(strerror(errno)));
}
if (setuid(runas_pw->pw_uid) < 0) {
- isc_throw(FatalError, "setuid() failed: " << strerror(errno));
+ throw FatalError("setuid() failed: " + string(strerror(errno)));
}
}
Modified: branches/trac384/src/bin/auth/common.h
==============================================================================
--- branches/trac384/src/bin/auth/common.h (original)
+++ branches/trac384/src/bin/auth/common.h Mon Jan 3 13:47:41 2011
@@ -17,12 +17,18 @@
#ifndef __COMMON_H
#define __COMMON_H 1
-#include <exceptions/exceptions.h>
+#include <stdexcept>
+#include <string>
-class FatalError : public isc::Exception {
+/// An exception class that is thrown in an unrecoverable error condition.
+///
+/// This exception should not be caught except at the highest level of
+/// the application only for terminating the program gracefully, and so
+/// it cannot be a derived class of \c isc::Exception.
+class FatalError : public std::runtime_error {
public:
- FatalError(const char* file, size_t line, const char* what) :
- isc::Exception(file, line, what) {}
+ FatalError(const std::string& what) : std::runtime_error(what)
+ {}
};
#endif // __COMMON_H
Modified: branches/trac384/src/bin/auth/main.cc
==============================================================================
--- branches/trac384/src/bin/auth/main.cc (original)
+++ branches/trac384/src/bin/auth/main.cc Mon Jan 3 13:47:41 2011
@@ -25,7 +25,7 @@
#include <cassert>
#include <iostream>
-#include <boost/foreach.hpp>
+#include <boost/bind.hpp>
#include <exceptions/exceptions.h>
@@ -41,6 +41,7 @@
#include <auth/spec_config.h>
#include <auth/common.h>
+#include <auth/config.h>
#include <auth/change_user.h>
#include <auth/auth_srv.h>
#include <asiolink/asiolink.h>
@@ -61,6 +62,10 @@
static const string PROGRAM = "Auth";
static const char* DNSPORT = "5300";
+// Note: this value must be greater than 0.
+// TODO: make it configurable via command channel.
+const uint32_t STATISTICS_SEND_INTERVAL_SEC = 60;
+
/* need global var for config/command handlers.
* todo: turn this around, and put handlers in the authserver
* class itself? */
@@ -83,8 +88,14 @@
answer = createAnswer(0, args);
} else if (command == "shutdown") {
io_service.stop();
- }
-
+ } else if (command == "sendstats") {
+ if (verbose_mode) {
+ cerr << "[b10-auth] command 'sendstats' received" << endl;
+ }
+ assert(auth_server != NULL);
+ auth_server->submitStatistics();
+ }
+
return (answer);
}
@@ -102,6 +113,12 @@
cerr << "\t-v: verbose output" << endl;
exit(1);
}
+
+void
+statisticsTimerCallback(AuthSrv* auth_server) {
+ assert(auth_server != NULL);
+ auth_server->submitStatistics();
+}
} // end of anonymous namespace
int
@@ -167,7 +184,10 @@
// XXX: we should eventually pass io_service here.
Session* cc_session = NULL;
Session* xfrin_session = NULL;
+ Session* statistics_session = NULL;
+ IntervalTimer* itimer = NULL;
bool xfrin_session_established = false; // XXX (see Trac #287)
+ bool statistics_session_established = false; // XXX (see Trac #287)
ModuleCCSession* config_session = NULL;
string xfrout_socket_path;
if (getenv("B10_FROM_BUILD") != NULL) {
@@ -229,14 +249,35 @@
xfrin_session_established = true;
cout << "[b10-auth] Xfrin session channel established." << endl;
+ statistics_session = new Session(io_service.get_io_service());
+ cout << "[b10-auth] Statistics session channel created." << endl;
+ statistics_session->establish(NULL);
+ statistics_session_established = true;
+ cout << "[b10-auth] Statistics session channel established." << endl;
+
// XXX: with the current interface to asiolink we have to create
// auth_server before io_service while Session needs io_service.
// In a next step of refactoring we should make asiolink independent
// from auth_server, and create io_service, auth_server, and
// sessions in that order.
auth_server->setXfrinSession(xfrin_session);
+ auth_server->setStatisticsSession(statistics_session);
+
+ // Configure the server. configureAuthServer() is expected to install
+ // all initial configurations, but as a short term workaround we
+ // handle the traditional "database_file" setup by directly calling
+ // updateConfig().
auth_server->setConfigSession(config_session);
+ configureAuthServer(*auth_server, config_session->getFullConfig());
auth_server->updateConfig(ElementPtr());
+
+ // create interval timer instance
+ itimer = new IntervalTimer(io_service);
+ // set up interval timer
+ // register function to send statistics with interval
+ itimer->setupTimer(boost::bind(statisticsTimerCallback, auth_server),
+ STATISTICS_SEND_INTERVAL_SEC);
+ cout << "[b10-auth] Interval timer to send statistics set." << endl;
cout << "[b10-auth] Server started." << endl;
io_service.run();
@@ -247,10 +288,16 @@
ret = 1;
}
+ if (statistics_session_established) {
+ statistics_session->disconnect();
+ }
+
if (xfrin_session_established) {
xfrin_session->disconnect();
}
+ delete itimer;
+ delete statistics_session;
delete xfrin_session;
delete config_session;
delete cc_session;
Modified: branches/trac384/src/bin/auth/query.cc
==============================================================================
--- branches/trac384/src/bin/auth/query.cc (original)
+++ branches/trac384/src/bin/auth/query.cc Mon Jan 3 13:47:41 2011
@@ -15,7 +15,7 @@
#include <dns/message.h>
#include <dns/rcode.h>
-#include <datasrc/zonetable.h>
+#include <datasrc/memory_datasrc.h>
#include <auth/query.h>
@@ -24,19 +24,74 @@
namespace isc {
namespace auth {
+
+void
+Query::putSOA(const Zone& zone) const {
+ Zone::FindResult soa_result(zone.find(zone.getOrigin(),
+ RRType::SOA()));
+ if (soa_result.code != Zone::SUCCESS) {
+ isc_throw(NoSOA, "There's no SOA record in zone " <<
+ zone.getOrigin().toText());
+ } else {
+ /*
+ * FIXME:
+ * The const-cast is wrong, but the Message interface seems
+ * to insist.
+ */
+ response_.addRRset(Message::SECTION_AUTHORITY,
+ boost::const_pointer_cast<RRset>(soa_result.rrset));
+ }
+}
+
void
Query::process() const {
- const ZoneTable::FindResult result = zone_table_.findZone(qname_);
+ bool keep_doing = true;
+ response_.setHeaderFlag(Message::HEADERFLAG_AA, false);
+ const MemoryDataSrc::FindResult result =
+ memory_datasrc_.findZone(qname_);
- if (result.code != isc::datasrc::result::SUCCESS &&
- result.code != isc::datasrc::result::PARTIALMATCH) {
- response_.setRcode(Rcode::SERVFAIL());
+ // If we have no matching authoritative zone for the query name, return
+ // REFUSED. In short, this is to be compatible with BIND 9, but the
+ // background discussion is not that simple. See the relevant topic
+ // at the BIND 10 developers's ML:
+ // https://lists.isc.org/mailman/htdig/bind10-dev/2010-December/001633.html
+ if (result.code != result::SUCCESS &&
+ result.code != result::PARTIALMATCH) {
+ response_.setRcode(Rcode::REFUSED());
return;
}
- // Right now we have no code to search the zone, so we simply return
- // NXDOMAIN for tests.
- response_.setRcode(Rcode::NXDOMAIN());
+ // Found a zone which is the nearest ancestor to QNAME, set the AA bit
+ response_.setHeaderFlag(Message::HEADERFLAG_AA);
+ while (keep_doing) {
+ keep_doing = false;
+ Zone::FindResult db_result = result.zone->find(qname_, qtype_);
+ switch (db_result.code) {
+ case Zone::SUCCESS:
+ response_.setRcode(Rcode::NOERROR());
+ response_.addRRset(Message::SECTION_ANSWER,
+ boost::const_pointer_cast<RRset>(db_result.rrset));
+ // TODO : fill in authority and addtional sections.
+ break;
+ case Zone::DELEGATION:
+ // TODO : add NS to authority section, fill in additional section.
+ break;
+ case Zone::NXDOMAIN:
+ // Just empty answer with SOA in authority section
+ response_.setRcode(Rcode::NXDOMAIN());
+ putSOA(*result.zone);
+ break;
+ case Zone::NXRRSET:
+ // Just empty answer with SOA in authority section
+ response_.setRcode(Rcode::NOERROR());
+ putSOA(*result.zone);
+ break;
+ case Zone::CNAME:
+ case Zone::DNAME:
+ // TODO : replace qname, continue lookup
+ break;
+ }
+ }
}
}
}
Modified: branches/trac384/src/bin/auth/query.h
==============================================================================
--- branches/trac384/src/bin/auth/query.h (original)
+++ branches/trac384/src/bin/auth/query.h Mon Jan 3 13:47:41 2011
@@ -14,6 +14,8 @@
* PERFORMANCE OF THIS SOFTWARE.
*/
+#include <exceptions/exceptions.h>
+
namespace isc {
namespace dns {
class Message;
@@ -22,7 +24,8 @@
}
namespace datasrc {
-class ZoneTable;
+class MemoryDataSrc;
+class Zone;
}
namespace auth {
@@ -32,11 +35,11 @@
///
/// Many of the design details for this class are still in flux.
/// We'll revisit and update them as we add more functionality, for example:
-/// - zone_table parameter of the constructor. This will eventually be
-/// replaced with a generic DataSrc object, or perhaps a notion of "view".
+/// - memory_datasrc parameter of the constructor. It is a data source that
+/// uses in memory dedicated backend.
/// - as a related point, we may have to pass the RR class of the query.
-/// in the initial implementation the RR class is an attribute of zone
-/// table and omitted. It's not clear if this assumption holds with
+/// in the initial implementation the RR class is an attribute of memory
+/// datasource and omitted. It's not clear if this assumption holds with
/// generic data sources. On the other hand, it will help keep
/// implementation simpler, and we might rather want to modify the design
/// of the data source on this point.
@@ -47,8 +50,8 @@
/// separate attribute setter.
/// - likewise, we'll eventually need to do per zone access control, for which
/// we need querier's information such as its IP address.
-/// - zone_table (or DataSrc eventually) and response may better be parameters
-/// to process() instead of the constructor.
+/// - memory_datasrc and response may better be parameters to process() instead
+/// of the constructor.
///
/// <b>Note:</b> The class name is intentionally the same as the one used in
/// the datasrc library. This is because the plan is to eventually merge
@@ -65,15 +68,15 @@
///
/// This constructor never throws an exception.
///
- /// \param zone_table The zone table wherein the answer to the query is
+ /// \param memory_datasrc The memory datasource wherein the answer to the query is
/// to be found.
/// \param qname The query name
/// \param qtype The RR type of the query
/// \param response The response message to store the answer to the query.
- Query(const isc::datasrc::ZoneTable& zone_table,
+ Query(const isc::datasrc::MemoryDataSrc& memory_datasrc,
const isc::dns::Name& qname, const isc::dns::RRType& qtype,
isc::dns::Message& response) :
- zone_table_(zone_table), qname_(qname), qtype_(qtype),
+ memory_datasrc_(memory_datasrc), qname_(qname), qtype_(qtype),
response_(response)
{}
@@ -87,7 +90,7 @@
/// successful search would result in adding a corresponding RRset to
/// the answer section of the response.
///
- /// If no matching zone is found in the zone table, the RCODE of
+ /// If no matching zone is found in the memory datasource, the RCODE of
/// SERVFAIL will be set in the response.
/// <b>Note:</b> this is different from the error code that BIND 9 returns
/// by default when it's configured as an authoritative-only server (and
@@ -100,15 +103,46 @@
/// providing compatible behavior may have its own benefit, so this point
/// should be revisited later.
///
- /// Right now this method never throws an exception, but it may in a
- /// future version.
+ /// This might throw BadZone or any of its specific subclasses, but that
+ /// shouldn't happen in real-life (as BadZone means wrong data, it should
+ /// have been rejected upon loading).
void process() const;
+ /// \short Bad zone data encountered.
+ ///
+ /// This is thrown when process encounteres misconfigured zone in a way
+ /// it can't continue. This throws, not sets the Rcode, because such
+ /// misconfigured zone should not be present in the data source and
+ /// should have been rejected sooner.
+ struct BadZone : public isc::Exception {
+ BadZone(const char* file, size_t line, const char* what) :
+ Exception(file, line, what)
+ {}
+ };
+
+ /// \short Zone is missing its SOA record.
+ ///
+ /// We tried to add a SOA into the authoritative section, but the zone
+ /// does not contain one.
+ struct NoSOA : public BadZone {
+ NoSOA(const char* file, size_t line, const char* what) :
+ BadZone(file, line, what)
+ {}
+ };
+
private:
- const isc::datasrc::ZoneTable& zone_table_;
+ const isc::datasrc::MemoryDataSrc& memory_datasrc_;
const isc::dns::Name& qname_;
const isc::dns::RRType& qtype_;
isc::dns::Message& response_;
+
+ /**
+ * \short Adds a SOA.
+ *
+ * Adds a SOA of the zone into the authority zone of response_.
+ * Can throw NoSOA.
+ */
+ void putSOA(const isc::datasrc::Zone& zone) const;
};
}
Modified: branches/trac384/src/bin/auth/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/auth/tests/Makefile.am (original)
+++ branches/trac384/src/bin/auth/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -21,9 +21,13 @@
run_unittests_SOURCES += ../auth_srv.h ../auth_srv.cc
run_unittests_SOURCES += ../query.h ../query.cc
run_unittests_SOURCES += ../change_user.h ../change_user.cc
+run_unittests_SOURCES += ../config.h ../config.cc
+run_unittests_SOURCES += ../statistics.h ../statistics.cc
run_unittests_SOURCES += auth_srv_unittest.cc
+run_unittests_SOURCES += config_unittest.cc
run_unittests_SOURCES += query_unittest.cc
run_unittests_SOURCES += change_user_unittest.cc
+run_unittests_SOURCES += statistics_unittest.cc
run_unittests_SOURCES += run_unittests.cc
run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
Modified: branches/trac384/src/bin/auth/tests/auth_srv_unittest.cc
==============================================================================
--- branches/trac384/src/bin/auth/tests/auth_srv_unittest.cc (original)
+++ branches/trac384/src/bin/auth/tests/auth_srv_unittest.cc Mon Jan 3 13:47:41 2011
@@ -15,12 +15,27 @@
// $Id$
#include <config.h>
+
+#include <vector>
+
+#include <gtest/gtest.h>
+
+#include <dns/message.h>
+#include <dns/messagerenderer.h>
+#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/rrtype.h>
+#include <dns/rrttl.h>
+#include <dns/rdataclass.h>
+
+#include <datasrc/memory_datasrc.h>
#include <auth/auth_srv.h>
#include <testutils/srv_unittest.h>
-
-using namespace std;
+#include <auth/statistics.h>
+
using namespace isc::cc;
using namespace isc::dns;
+using namespace isc::dns::rdata;
using namespace isc::data;
using namespace isc::xfr;
using namespace asiolink;
@@ -36,12 +51,111 @@
class AuthSrvTest : public SrvTestBase {
protected:
- AuthSrvTest() : server(true, xfrout) {
+ AuthSrvTest() : server(true, xfrout), rrclass(RRClass::IN()) {
server.setXfrinSession(¬ify_session);
+ server.setStatisticsSession(&statistics_session);
}
+ MockSession statistics_session;
MockXfroutClient xfrout;
AuthSrv server;
+ const RRClass rrclass;
+ vector<uint8_t> response_data;
};
+
+// A helper function that builds a response to version.bind/TXT/CH that
+// should be identical to the response from our builtin (static) data source
+// by default. The resulting wire-format data will be stored in 'data'.
+void
+createBuiltinVersionResponse(const qid_t qid, vector<uint8_t>& data) {
+ const Name version_name("version.bind");
+ Message message(Message::RENDER);
+
+ UnitTestUtil::createRequestMessage(message, Opcode::QUERY(),
+ qid, version_name,
+ RRClass::CH(), RRType::TXT());
+ message.setHeaderFlag(Message::HEADERFLAG_QR);
+ message.setHeaderFlag(Message::HEADERFLAG_AA);
+ RRsetPtr rrset_version = RRsetPtr(new RRset(version_name, RRClass::CH(),
+ RRType::TXT(), RRTTL(0)));
+ rrset_version->addRdata(generic::TXT(PACKAGE_STRING));
+ message.addRRset(Message::SECTION_ANSWER, rrset_version);
+
+ RRsetPtr rrset_version_ns = RRsetPtr(new RRset(version_name, RRClass::CH(),
+ RRType::NS(), RRTTL(0)));
+ rrset_version_ns->addRdata(generic::NS(version_name));
+ message.addRRset(Message::SECTION_AUTHORITY, rrset_version_ns);
+
+ OutputBuffer obuffer(0);
+ MessageRenderer renderer(obuffer);
+ message.toWire(renderer);
+
+ data.clear();
+ data.assign(static_cast<const uint8_t*>(renderer.getData()),
+ static_cast<const uint8_t*>(renderer.getData()) +
+ renderer.getLength());
+}
+
+// In the following tests we confirm the response data is rendered in
+// wire format in the expected way.
+
+// The most primitive check: checking the result of the processMessage()
+// method
+TEST_F(AuthSrvTest, builtInQuery) {
+ UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
+ default_qid, Name("version.bind"),
+ RRClass::CH(), RRType::TXT());
+ createRequestPacket(request_message, IPPROTO_UDP);
+ server.processMessage(*io_message, parse_message, response_obuffer,
+ &dnsserv);
+ createBuiltinVersionResponse(default_qid, response_data);
+ EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+ response_obuffer->getData(),
+ response_obuffer->getLength(),
+ &response_data[0], response_data.size());
+}
+
+// Same test emulating the UDPServer class behavior (defined in libasiolink).
+// This is not a good test in that it assumes internal implementation details
+// of UDPServer, but we've encountered a regression due to the introduction
+// of that class, so we add a test for that case to prevent such a regression
+// in future.
+// Besides, the generalization of UDPServer is probably too much for the
+// authoritative only server in terms of performance, and it's quite likely
+// we need to drop it for the authoritative server implementation.
+// At that point we can drop this test, too.
+TEST_F(AuthSrvTest, builtInQueryViaDNSServer) {
+ UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
+ default_qid, Name("version.bind"),
+ RRClass::CH(), RRType::TXT());
+ createRequestPacket(request_message, IPPROTO_UDP);
+
+ (*server.getDNSLookupProvider())(*io_message, parse_message,
+ response_obuffer, &dnsserv);
+ (*server.getDNSAnswerProvider())(*io_message, parse_message,
+ response_obuffer);
+
+ createBuiltinVersionResponse(default_qid, response_data);
+ EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+ response_obuffer->getData(),
+ response_obuffer->getLength(),
+ &response_data[0], response_data.size());
+}
+
+// Same type of test as builtInQueryViaDNSServer but for an error response.
+TEST_F(AuthSrvTest, iqueryViaDNSServer) {
+ createDataFromFile("iquery_fromWire.wire");
+ (*server.getDNSLookupProvider())(*io_message, parse_message,
+ response_obuffer, &dnsserv);
+ (*server.getDNSAnswerProvider())(*io_message, parse_message,
+ response_obuffer);
+
+ UnitTestUtil::readWireData("iquery_response_fromWire.wire",
+ response_data);
+ EXPECT_PRED_FORMAT4(UnitTestUtil::matchWireData,
+ response_obuffer->getData(),
+ response_obuffer->getLength(),
+ &response_data[0], response_data.size());
+}
// Unsupported requests. Should result in NOTIMP.
TEST_F(AuthSrvTest, unsupportedRequest) {
@@ -325,11 +439,11 @@
}
void
-updateConfig(AuthSrv* server, const char* const dbfile,
+updateConfig(AuthSrv* server, const char* const config_data,
const bool expect_success)
{
ConstElementPtr config_answer =
- server->updateConfig(Element::fromJSON(dbfile));
+ server->updateConfig(Element::fromJSON(config_data));
EXPECT_EQ(Element::map, config_answer->getType());
EXPECT_TRUE(config_answer->contains("result"));
@@ -381,6 +495,44 @@
QR_FLAG | AA_FLAG, 1, 1, 1, 0);
}
+TEST_F(AuthSrvTest, updateWithMemoryDataSrc) {
+ // Test configuring memory data source. Detailed test cases are covered
+ // in the configuration tests. We only check the AuthSrv interface here.
+
+ // By default memory data source isn't enabled
+ EXPECT_EQ(AuthSrv::MemoryDataSrcPtr(), server.getMemoryDataSrc(rrclass));
+ updateConfig(&server,
+ "{\"datasources\": [{\"type\": \"memory\"}]}", true);
+ // after successful configuration, we should have one (with empty zoneset).
+ ASSERT_NE(AuthSrv::MemoryDataSrcPtr(), server.getMemoryDataSrc(rrclass));
+ EXPECT_EQ(0, server.getMemoryDataSrc(rrclass)->getZoneCount());
+
+ // The memory data source is empty, should return REFUSED rcode.
+ createDataFromFile("examplequery_fromWire.wire");
+ server.processMessage(*io_message, parse_message, response_obuffer,
+ &dnsserv);
+ EXPECT_TRUE(dnsserv.hasAnswer());
+ headerCheck(*parse_message, default_qid, Rcode::REFUSED(),
+ opcode.getCode(), QR_FLAG, 1, 0, 0, 0);
+}
+
+TEST_F(AuthSrvTest, chQueryWithMemoryDataSrc) {
+ // Configure memory data source for class IN
+ updateConfig(&server, "{\"datasources\": "
+ "[{\"class\": \"IN\", \"type\": \"memory\"}]}", true);
+
+ // This shouldn't affect the result of class CH query
+ UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
+ default_qid, Name("version.bind"),
+ RRClass::CH(), RRType::TXT());
+ createRequestPacket(request_message, IPPROTO_UDP);
+ server.processMessage(*io_message, parse_message, response_obuffer,
+ &dnsserv);
+ EXPECT_TRUE(dnsserv.hasAnswer());
+ headerCheck(*parse_message, default_qid, Rcode::NOERROR(),
+ opcode.getCode(), QR_FLAG | AA_FLAG, 1, 1, 1, 0);
+}
+
TEST_F(AuthSrvTest, cacheSlots) {
// simple check for the get/set operations
server.setCacheSlots(10); // 10 = arbitrary choice
@@ -390,4 +542,90 @@
server.setCacheSlots(0);
EXPECT_EQ(00, server.getCacheSlots());
}
-}
+
+// Submit UDP normal query and check query counter
+TEST_F(AuthSrvTest, queryCounterUDPNormal) {
+ // The counter should be initialized to 0.
+ EXPECT_EQ(0, server.getCounter(AuthCounters::COUNTER_UDP_QUERY));
+ // Create UDP message and process.
+ UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
+ default_qid, Name("example.com"),
+ RRClass::IN(), RRType::NS());
+ createRequestPacket(request_message, IPPROTO_UDP);
+ server.processMessage(*io_message, parse_message, response_obuffer,
+ &dnsserv);
+ // After processing UDP query, the counter should be 1.
+ EXPECT_EQ(1, server.getCounter(AuthCounters::COUNTER_UDP_QUERY));
+}
+
+// Submit TCP normal query and check query counter
+TEST_F(AuthSrvTest, queryCounterTCPNormal) {
+ // The counter should be initialized to 0.
+ EXPECT_EQ(0, server.getCounter(AuthCounters::COUNTER_TCP_QUERY));
+ // Create TCP message and process.
+ UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
+ default_qid, Name("example.com"),
+ RRClass::IN(), RRType::NS());
+ createRequestPacket(request_message, IPPROTO_TCP);
+ server.processMessage(*io_message, parse_message, response_obuffer,
+ &dnsserv);
+ // After processing TCP query, the counter should be 1.
+ EXPECT_EQ(1, server.getCounter(AuthCounters::COUNTER_TCP_QUERY));
+}
+
+// Submit TCP AXFR query and check query counter
+TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
+ // The counter should be initialized to 0.
+ EXPECT_EQ(0, server.getCounter(AuthCounters::COUNTER_TCP_QUERY));
+ UnitTestUtil::createRequestMessage(request_message, opcode, default_qid,
+ Name("example.com"), RRClass::IN(), RRType::AXFR());
+ createRequestPacket(request_message, IPPROTO_TCP);
+ // On success, the AXFR query has been passed to a separate process,
+ // so we shouldn't have to respond.
+ server.processMessage(*io_message, parse_message, response_obuffer, &dnsserv);
+ // After processing TCP AXFR query, the counter should be 1.
+ EXPECT_EQ(1, server.getCounter(AuthCounters::COUNTER_TCP_QUERY));
+}
+
+// class for queryCounterUnexpected test
+// getProtocol() returns IPPROTO_IP
+class DummyUnknownSocket : public IOSocket {
+public:
+ DummyUnknownSocket() {}
+ virtual int getNative() const { return (0); }
+ virtual int getProtocol() const { return (IPPROTO_IP); }
+};
+
+// function for queryCounterUnexpected test
+// returns a reference to a static object of DummyUnknownSocket
+IOSocket&
+getDummyUnknownSocket() {
+ static DummyUnknownSocket socket;
+ return (socket);
+}
+
+// Submit unexpected type of query and check it throws isc::Unexpected
+TEST_F(AuthSrvTest, queryCounterUnexpected) {
+ // This code isn't exception safe, but we'd rather keep the code
+ // simpler and more readable as this is only for tests and if it throws
+ // the program would immediately terminate anyway.
+
+ // Create UDP query packet.
+ UnitTestUtil::createRequestMessage(request_message, Opcode::QUERY(),
+ default_qid, Name("example.com"),
+ RRClass::IN(), RRType::NS());
+ createRequestPacket(request_message, IPPROTO_UDP);
+
+ // Modify the message.
+ delete io_message;
+ endpoint = IOEndpoint::create(IPPROTO_UDP,
+ IOAddress(DEFAULT_REMOTE_ADDRESS), 5300);
+ io_message = new IOMessage(request_renderer.getData(),
+ request_renderer.getLength(),
+ getDummyUnknownSocket(), *endpoint);
+
+ EXPECT_THROW(server.processMessage(*io_message, parse_message,
+ response_obuffer, &dnsserv),
+ isc::Unexpected);
+}
+}
Modified: branches/trac384/src/bin/auth/tests/query_unittest.cc
==============================================================================
--- branches/trac384/src/bin/auth/tests/query_unittest.cc (original)
+++ branches/trac384/src/bin/auth/tests/query_unittest.cc Mon Jan 3 13:47:41 2011
@@ -15,9 +15,10 @@
#include <dns/message.h>
#include <dns/name.h>
#include <dns/rcode.h>
+#include <dns/rrttl.h>
#include <dns/rrtype.h>
-#include <datasrc/zonetable.h>
+#include <datasrc/memory_datasrc.h>
#include <auth/query.h>
@@ -28,16 +29,80 @@
using namespace isc::auth;
namespace {
+
+RRsetPtr a_rrset = RRsetPtr(new RRset(Name("www.example.com"),
+ RRClass::IN(), RRType::A(),
+ RRTTL(3600)));
+RRsetPtr soa_rrset = RRsetPtr(new RRset(Name("example.com"),
+ RRClass::IN(), RRType::SOA(),
+ RRTTL(3600)));
+// This is a mock Zone class for testing.
+// It is a derived class of Zone, and simply hardcode the results of find()
+// return SUCCESS for "www.example.com",
+// return NXDOMAIN for "nxdomain.example.com",
+// return NXRRSET for "nxrrset.example.com",
+// return CNAME for "cname.example.com",
+// else return DNAME
+class MockZone : public Zone {
+public:
+ MockZone(bool has_SOA = true) :
+ origin_(Name("example.com")),
+ has_SOA_(has_SOA)
+ {}
+ virtual const isc::dns::Name& getOrigin() const;
+ virtual const isc::dns::RRClass& getClass() const;
+
+ FindResult find(const isc::dns::Name& name,
+ const isc::dns::RRType& type,
+ const FindOptions options = FIND_DEFAULT) const;
+
+private:
+ Name origin_;
+ bool has_SOA_;
+};
+
+const Name&
+MockZone::getOrigin() const {
+ return (origin_);
+}
+
+const RRClass&
+MockZone::getClass() const {
+ return (RRClass::IN());
+}
+
+Zone::FindResult
+MockZone::find(const Name& name, const RRType& type, const FindOptions) const {
+ // hardcode the find results
+ if (name == Name("www.example.com")) {
+ return (FindResult(SUCCESS, a_rrset));
+ } else if (name == Name("example.com") && type == RRType::SOA() &&
+ has_SOA_)
+ {
+ return (FindResult(SUCCESS, soa_rrset));
+ } else if (name == Name("delegation.example.com")) {
+ return (FindResult(DELEGATION, RRsetPtr()));
+ } else if (name == Name("nxdomain.example.com")) {
+ return (FindResult(NXDOMAIN, RRsetPtr()));
+ } else if (name == Name("nxrrset.example.com")) {
+ return (FindResult(NXRRSET, RRsetPtr()));
+ } else if (name == Name("cname.example.com")) {
+ return (FindResult(CNAME, RRsetPtr()));
+ } else {
+ return (FindResult(DNAME, RRsetPtr()));
+ }
+}
+
class QueryTest : public ::testing::Test {
protected:
QueryTest() :
qname(Name("www.example.com")), qclass(RRClass::IN()),
qtype(RRType::A()), response(Message::RENDER),
- query(zone_table, qname, qtype, response)
+ query(memory_datasrc, qname, qtype, response)
{
response.setRcode(Rcode::NOERROR());
}
- ZoneTable zone_table;
+ MemoryDataSrc memory_datasrc;
const Name qname;
const RRClass qclass;
const RRType qtype;
@@ -46,25 +111,69 @@
};
TEST_F(QueryTest, noZone) {
- // There's no zone in the zone table. So the response should have
- // SERVFAIL.
+ // There's no zone in the memory datasource. So the response should have
+ // REFUSED.
query.process();
- EXPECT_EQ(Rcode::SERVFAIL(), response.getRcode());
+ EXPECT_EQ(Rcode::REFUSED(), response.getRcode());
}
TEST_F(QueryTest, matchZone) {
- // add a matching zone. since the zone is empty right now, the response
- // should have NXDOMAIN.
- zone_table.addZone(ZonePtr(new MemoryZone(qclass, Name("example.com"))));
+ // add a matching zone.
+ memory_datasrc.addZone(ZonePtr(new MockZone()));
query.process();
+ EXPECT_EQ(Rcode::NOERROR(), response.getRcode());
+ EXPECT_TRUE(response.hasRRset(Message::SECTION_ANSWER,
+ Name("www.example.com"), RRClass::IN(),
+ RRType::A()));
+
+ // NXDOMAIN
+ const Name nxdomain_name(Name("nxdomain.example.com"));
+ Query nxdomain_query(memory_datasrc, nxdomain_name, qtype, response);
+ nxdomain_query.process();
EXPECT_EQ(Rcode::NXDOMAIN(), response.getRcode());
+ EXPECT_EQ(0, response.getRRCount(Message::SECTION_ANSWER));
+ EXPECT_EQ(0, response.getRRCount(Message::SECTION_ADDITIONAL));
+ EXPECT_TRUE(response.hasRRset(Message::SECTION_AUTHORITY,
+ Name("example.com"), RRClass::IN(), RRType::SOA()));
+
+ // NXRRSET
+ const Name nxrrset_name(Name("nxrrset.example.com"));
+ Query nxrrset_query(memory_datasrc, nxrrset_name, qtype, response);
+ nxrrset_query.process();
+ EXPECT_EQ(Rcode::NOERROR(), response.getRcode());
+ EXPECT_EQ(0, response.getRRCount(Message::SECTION_ANSWER));
+ EXPECT_EQ(0, response.getRRCount(Message::SECTION_ADDITIONAL));
+ EXPECT_TRUE(response.hasRRset(Message::SECTION_AUTHORITY,
+ Name("example.com"), RRClass::IN(), RRType::SOA()));
+}
+
+/*
+ * This tests that when there's no SOA and we need a negative answer. It should
+ * throw in that case.
+ */
+TEST_F(QueryTest, noSOA) {
+ memory_datasrc.addZone(ZonePtr(new MockZone(false)));
+
+ // The NX Domain
+ const Name nxdomain_name(Name("nxdomain.example.com"));
+ Query nxdomain_query(memory_datasrc, nxdomain_name, qtype, response);
+ EXPECT_THROW(nxdomain_query.process(), Query::NoSOA);
+ // Of course, we don't look into the response, as it throwed
+
+ // NXRRSET
+ const Name nxrrset_name(Name("nxrrset.example.com"));
+ Query nxrrset_query(memory_datasrc, nxrrset_name, qtype, response);
+ EXPECT_THROW(nxrrset_query.process(), Query::NoSOA);
}
TEST_F(QueryTest, noMatchZone) {
- // there's a zone in the table but it doesn't match the qname. should
- // result in SERVFAIL.
- zone_table.addZone(ZonePtr(new MemoryZone(qclass, Name("example.org"))));
- query.process();
- EXPECT_EQ(Rcode::SERVFAIL(), response.getRcode());
+ // there's a zone in the memory datasource but it doesn't match the qname.
+ // should result in REFUSED.
+ memory_datasrc.addZone(ZonePtr(new MockZone()));
+ const Name nomatch_name(Name("example.org"));
+ Query nomatch_query(memory_datasrc, nomatch_name, qtype, response);
+ nomatch_query.process();
+ EXPECT_EQ(Rcode::REFUSED(), response.getRcode());
}
+
}
Modified: branches/trac384/src/bin/bind10/bind10.py.in
==============================================================================
--- branches/trac384/src/bin/bind10/bind10.py.in (original)
+++ branches/trac384/src/bin/bind10/bind10.py.in Mon Jan 3 13:47:41 2011
@@ -206,12 +206,11 @@
"""
self.address = address
self.dns_port = dns_port
- self.forward = None
- self.recursive = False
+ self.forward = forward
if forward:
- self.forward = forward
self.recursive = True
- self.nocache = False
+ else:
+ self.recursive = False
self.cc_session = None
self.ccs = None
self.cfg_start_auth = True
@@ -740,7 +739,7 @@
try:
if opt_str in ['-a', '--address']:
parser.values.address = isc.net.parse.addr_parse(value)
- if opt_str in ['-f', '--forward']:
+ elif opt_str in ['-f', '--forward']:
parser.values.forward = isc.net.parse.addr_parse(value)
else:
raise OptionValueError("Unknown option " + opt_str)
@@ -763,7 +762,7 @@
action="callback", callback=check_addr, default=None,
help="address the DNS server will use (default: listen on all addresses)")
parser.add_option("-f", "--forward", dest="forward", type="string",
- action="callback", callback=check_addr, default='',
+ action="callback", callback=check_addr, default=None,
help="nameserver to which DNS queries should be forwarded")
parser.add_option("-m", "--msgq-socket-file", dest="msgq_socket_file",
type="string", default=None,
Modified: branches/trac384/src/bin/bind10/run_bind10.sh.in
==============================================================================
--- branches/trac384/src/bin/bind10/run_bind10.sh.in (original)
+++ branches/trac384/src/bin/bind10/run_bind10.sh.in Mon Jan 3 13:47:41 2011
@@ -46,5 +46,5 @@
export BIND10_MSGQ_SOCKET_FILE
cd ${BIND10_PATH}
-exec ${PYTHON_EXEC} -O bind10 $*
+exec ${PYTHON_EXEC} -O bind10 "$@"
Modified: branches/trac384/src/bin/bind10/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/bind10/tests/Makefile.am (original)
+++ branches/trac384/src/bin/bind10/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,12 +1,17 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
+#PYTESTS = args_test.py bind10_test.py
PYTESTS = bind10_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/bind10 \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/bindctl/run_bindctl.sh.in
==============================================================================
--- branches/trac384/src/bin/bindctl/run_bindctl.sh.in (original)
+++ branches/trac384/src/bin/bindctl/run_bindctl.sh.in Mon Jan 3 13:47:41 2011
@@ -26,5 +26,8 @@
B10_FROM_SOURCE=@abs_top_srcdir@
export B10_FROM_SOURCE
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${BINDCTL_PATH}
-exec ${PYTHON_EXEC} -O bindctl $*
+exec ${PYTHON_EXEC} -O bindctl "$@"
Modified: branches/trac384/src/bin/bindctl/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/bindctl/tests/Makefile.am (original)
+++ branches/trac384/src/bin/bindctl/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = bindctl_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_srcdir)/src/bin \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/cfgmgr/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/cfgmgr/tests/Makefile.am (original)
+++ branches/trac384/src/bin/cfgmgr/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,13 +1,17 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = b10-cfgmgr_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cfgmgr \
- $(PYCOVERAGE) $(abs_builddir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/cmdctl/run_b10-cmdctl.sh.in
==============================================================================
--- branches/trac384/src/bin/cmdctl/run_b10-cmdctl.sh.in (original)
+++ branches/trac384/src/bin/cmdctl/run_b10-cmdctl.sh.in Mon Jan 3 13:47:41 2011
@@ -22,6 +22,8 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${CMD_CTRLD_PATH}
-${PYTHON_EXEC} b10-cmdctl
-
+exec ${PYTHON_EXEC} b10-cmdctl "$@"
Modified: branches/trac384/src/bin/cmdctl/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/cmdctl/tests/Makefile.am (original)
+++ branches/trac384/src/bin/cmdctl/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,14 +1,18 @@
+PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = cmdctl_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/cmdctl \
CMDCTL_SPEC_PATH=$(abs_top_builddir)/src/bin/cmdctl \
CMDCTL_SRC_PATH=$(abs_top_srcdir)/src/bin/cmdctl \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/loadzone/run_loadzone.sh.in
==============================================================================
--- branches/trac384/src/bin/loadzone/run_loadzone.sh.in (original)
+++ branches/trac384/src/bin/loadzone/run_loadzone.sh.in Mon Jan 3 13:47:41 2011
@@ -21,5 +21,8 @@
PYTHONPATH=@abs_top_builddir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
LOADZONE_PATH=@abs_top_builddir@/src/bin/loadzone
-exec ${LOADZONE_PATH}/b10-loadzone $*
+exec ${LOADZONE_PATH}/b10-loadzone "$@"
Modified: branches/trac384/src/bin/loadzone/tests/correct/Makefile.am
==============================================================================
--- branches/trac384/src/bin/loadzone/tests/correct/Makefile.am (original)
+++ branches/trac384/src/bin/loadzone/tests/correct/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,4 +1,3 @@
-PYTESTS = correct_test.sh
EXTRA_DIST = get_zonedatas.py
EXTRA_DIST += include.db
EXTRA_DIST += inclsub.db
@@ -14,12 +13,8 @@
EXTRA_DIST += ttlext.db
EXTRA_DIST += example.db
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
+# TODO: maybe use TESTS?
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
- for pytest in $(PYTESTS) ; do \
- echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/loadzone \
- $(SHELL) $(abs_builddir)/$$pytest || exit ; \
- done
+ echo Running test: correct_test.sh
+ $(SHELL) $(abs_builddir)/correct_test.sh
Modified: branches/trac384/src/bin/loadzone/tests/error/Makefile.am
==============================================================================
--- branches/trac384/src/bin/loadzone/tests/error/Makefile.am (original)
+++ branches/trac384/src/bin/loadzone/tests/error/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,5 +1,3 @@
-PYTESTS = error_test.sh
-
EXTRA_DIST = error.known
EXTRA_DIST += formerr1.db
EXTRA_DIST += formerr2.db
@@ -14,12 +12,8 @@
EXTRA_DIST += originerr1.db
EXTRA_DIST += originerr2.db
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
+# TODO: use TESTS ?
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
- for pytest in $(PYTESTS) ; do \
- echo Running test: $$pytest ; \
- env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/bin/loadzone \
- $(SHELL) $(abs_builddir)/$$pytest || exit ; \
- done
+ echo Running test: error_test.sh
+ $(SHELL) $(abs_builddir)/error_test.sh
Modified: branches/trac384/src/bin/msgq/run_msgq.sh.in
==============================================================================
--- branches/trac384/src/bin/msgq/run_msgq.sh.in (original)
+++ branches/trac384/src/bin/msgq/run_msgq.sh.in Mon Jan 3 13:47:41 2011
@@ -23,5 +23,8 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
-exec ${PYTHON_EXEC} -O b10-msgq $*
+exec ${PYTHON_EXEC} -O b10-msgq "$@"
Modified: branches/trac384/src/bin/msgq/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/msgq/tests/Makefile.am (original)
+++ branches/trac384/src/bin/msgq/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,14 +1,18 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = msgq_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/msgq:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
BIND10_TEST_SOCKET_FILE=$(builddir)/test_msgq_socket.sock \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/recurse/b10-recurse.8
==============================================================================
--- branches/trac384/src/bin/recurse/b10-recurse.8 (original)
+++ branches/trac384/src/bin/recurse/b10-recurse.8 Mon Jan 3 13:47:41 2011
@@ -2,12 +2,12 @@
.\" Title: b10-recurse
.\" Author: [FIXME: author] [see http://docbook.sf.net/el/author]
.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\" Date: September 16, 2010
+.\" Date: December 27, 2010
.\" Manual: BIND10
.\" Source: BIND10
.\" Language: English
.\"
-.TH "B10\-RECURSE" "8" "September 16, 2010" "BIND10" "BIND10"
+.TH "B10\-RECURSE" "8" "December 27, 2010" "BIND10" "BIND10"
.\" -----------------------------------------------------------------
.\" * set default formatting
.\" -----------------------------------------------------------------
@@ -22,7 +22,7 @@
b10-recurse \- Recursive DNS server
.SH "SYNOPSIS"
.HP \w'\fBb10\-recurse\fR\ 'u
-\fBb10\-recurse\fR [\fB\-4\fR] [\fB\-6\fR] [\fB\-a\ \fR\fB\fIaddress\fR\fR] [\fB\-n\fR] [\fB\-p\ \fR\fB\fInumber\fR\fR] [\fB\-u\ \fR\fB\fIusername\fR\fR] [\fB\-v\fR]
+\fBb10\-recurse\fR [\fB\-u\ \fR\fB\fIusername\fR\fR] [\fB\-v\fR]
.SH "DESCRIPTION"
.PP
The
@@ -60,55 +60,6 @@
.PP
The arguments are as follows:
.PP
-\fB\-4\fR
-.RS 4
-Enables IPv4 only mode\&. This switch may not be used with
-\fB\-6\fR
-nor
-\fB\-a\fR\&. By default, it listens on both IPv4 and IPv6 (if capable)\&.
-.RE
-.PP
-\fB\-6\fR
-.RS 4
-Enables IPv6 only mode\&. This switch may not be used with
-\fB\-4\fR
-nor
-\fB\-a\fR\&. By default, it listens on both IPv4 and IPv6 (if capable)\&.
-.RE
-.PP
-\fB\-a \fR\fB\fIaddress\fR\fR
-.RS 4
-The IPv4 or IPv6 address to listen on\&. This switch may not be used with
-\fB\-4\fR
-nor
-\fB\-6\fR\&. The default is to listen on all addresses\&. (This is a short term workaround\&. This argument may change\&.)
-.RE
-.PP
-\fB\-n\fR
-.RS 4
-Do not cache answers in memory\&. The default is to use the cache for faster responses\&. The cache keeps the most recent 30,000 answers (positive and negative) in memory for 30 seconds (instead of querying the data source, such as SQLite3 database, each time)\&.
-.RE
-.PP
-\fB\-p \fR\fB\fInumber\fR\fR
-.RS 4
-The port number it listens on\&. The default is 5300\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-The Y1 prototype runs on all interfaces and on this nonstandard port\&.
-.sp .5v
-.RE
-.RE
-.PP
\fB\-u \fR\fB\fIusername\fR\fR
.RS 4
The user name of the
@@ -130,7 +81,6 @@
\fBb10-cfgmgr\fR(8),
\fBb10-cmdctl\fR(8),
-\fBb10-loadzone\fR(8),
\fBb10-msgq\fR(8),
\fBbind10\fR(8),
BIND 10 Guide\&.
Modified: branches/trac384/src/bin/recurse/b10-recurse.xml
==============================================================================
--- branches/trac384/src/bin/recurse/b10-recurse.xml (original)
+++ branches/trac384/src/bin/recurse/b10-recurse.xml Mon Jan 3 13:47:41 2011
@@ -21,7 +21,7 @@
<refentry>
<refentryinfo>
- <date>September 16, 2010</date>
+ <date>December 27, 2010</date>
</refentryinfo>
<refmeta>
@@ -45,11 +45,6 @@
<refsynopsisdiv>
<cmdsynopsis>
<command>b10-recurse</command>
- <arg><option>-4</option></arg>
- <arg><option>-6</option></arg>
- <arg><option>-a <replaceable>address</replaceable></option></arg>
- <arg><option>-n</option></arg>
- <arg><option>-p <replaceable>number</replaceable></option></arg>
<arg><option>-u <replaceable>username</replaceable></option></arg>
<arg><option>-v</option></arg>
</cmdsynopsis>
@@ -89,59 +84,6 @@
<para>The arguments are as follows:</para>
<variablelist>
- <varlistentry>
- <term><option>-4</option></term>
- <listitem><para>
- Enables IPv4 only mode.
- This switch may not be used with <option>-6</option> nor
- <option>-a</option>.
- By default, it listens on both IPv4 and IPv6 (if capable).
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-6</option></term>
- <listitem><para>
- Enables IPv6 only mode.
- This switch may not be used with <option>-4</option> nor
- <option>-a</option>.
- By default, it listens on both IPv4 and IPv6 (if capable).
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-a <replaceable>address</replaceable></option></term>
-
- <listitem>
- <para>The IPv4 or IPv6 address to listen on.
- This switch may not be used with <option>-4</option> nor
- <option>-6</option>.
- The default is to listen on all addresses.
- (This is a short term workaround. This argument may change.)
- </para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-n</option></term>
- <listitem><para>
- Do not cache answers in memory.
- The default is to use the cache for faster responses.
- The cache keeps the most recent 30,000 answers (positive
- and negative) in memory for 30 seconds (instead of querying
- the data source, such as SQLite3 database, each time).
- </para></listitem>
- </varlistentry>
-
- <varlistentry>
- <term><option>-p <replaceable>number</replaceable></option></term>
- <listitem><para>
- The port number it listens on.
- The default is 5300.</para>
- <note><simpara>The Y1 prototype runs on all interfaces
- and on this nonstandard port.</simpara></note>
- </listitem>
- </varlistentry>
<varlistentry>
<term><option>-u <replaceable>username</replaceable></option></term>
@@ -187,9 +129,6 @@
<refentrytitle>b10-cmdctl</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
- <refentrytitle>b10-loadzone</refentrytitle><manvolnum>8</manvolnum>
- </citerefentry>,
- <citerefentry>
<refentrytitle>b10-msgq</refentrytitle><manvolnum>8</manvolnum>
</citerefentry>,
<citerefentry>
Modified: branches/trac384/src/bin/stats/run_b10-stats.sh.in
==============================================================================
--- branches/trac384/src/bin/stats/run_b10-stats.sh.in (original)
+++ branches/trac384/src/bin/stats/run_b10-stats.sh.in Mon Jan 3 13:47:41 2011
@@ -21,10 +21,13 @@
PYTHONPATH=@abs_top_builddir@/src/lib/python
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
B10_FROM_BUILD=@abs_top_builddir@
export B10_FROM_BUILD
STATS_PATH=@abs_top_builddir@/src/bin/stats
cd ${STATS_PATH}
-exec ${PYTHON_EXEC} -O b10-stats $*
+exec ${PYTHON_EXEC} -O b10-stats "$@"
Modified: branches/trac384/src/bin/stats/run_b10-stats_stub.sh.in
==============================================================================
--- branches/trac384/src/bin/stats/run_b10-stats_stub.sh.in (original)
+++ branches/trac384/src/bin/stats/run_b10-stats_stub.sh.in Mon Jan 3 13:47:41 2011
@@ -24,7 +24,10 @@
B10_FROM_BUILD=@abs_top_srcdir@
export B10_FROM_BUILD
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
STATS_PATH=@abs_top_builddir@/src/bin/stats
cd ${STATS_PATH}
-exec ${PYTHON_EXEC} -O b10-stats_stub $*
+exec ${PYTHON_EXEC} -O b10-stats_stub "$@"
Modified: branches/trac384/src/bin/stats/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/stats/tests/Makefile.am (original)
+++ branches/trac384/src/bin/stats/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,15 +1,19 @@
SUBDIRS = isc testdata
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = b10-stats_test.py b10-stats_stub_test.py
EXTRA_DIST = $(PYTESTS) fake_time.py
CLEANFILES = fake_time.pyc
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/bin/stats:$(abs_top_builddir)/src/bin/stats/tests \
B10_FROM_BUILD=$(abs_top_builddir) \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/tests/Makefile.am (original)
+++ branches/trac384/src/bin/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,13 +1,17 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = process_rename_test.py
# .py will be generated by configure, so we don't have to include it
# in EXTRA_DIST.
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
- $(PYCOVERAGE) $(abs_builddir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_builddir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in
==============================================================================
--- branches/trac384/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in (original)
+++ branches/trac384/src/bin/usermgr/run_b10-cmdctl-usermgr.sh.in Mon Jan 3 13:47:41 2011
@@ -20,6 +20,8 @@
MYPATH_PATH=@abs_top_builddir@/src/bin/usermgr
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
-${PYTHON_EXEC} b10-cmdctl-usermgr
-
+exec ${PYTHON_EXEC} b10-cmdctl-usermgr "$@"
Modified: branches/trac384/src/bin/xfrin/run_b10-xfrin.sh.in
==============================================================================
--- branches/trac384/src/bin/xfrin/run_b10-xfrin.sh.in (original)
+++ branches/trac384/src/bin/xfrin/run_b10-xfrin.sh.in Mon Jan 3 13:47:41 2011
@@ -22,6 +22,8 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/.libs
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
-${PYTHON_EXEC} b10-xfrin
-
+exec ${PYTHON_EXEC} b10-xfrin "$@"
Modified: branches/trac384/src/bin/xfrin/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/xfrin/tests/Makefile.am (original)
+++ branches/trac384/src/bin/xfrin/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,3 +1,4 @@
+PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = xfrin_test.py
EXTRA_DIST = $(PYTESTS)
@@ -8,13 +9,16 @@
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
endif
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/bin/xfrin:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
$(LIBRARY_PATH_PLACEHOLDER) \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/xfrout/run_b10-xfrout.sh.in
==============================================================================
--- branches/trac384/src/bin/xfrout/run_b10-xfrout.sh.in (original)
+++ branches/trac384/src/bin/xfrout/run_b10-xfrout.sh.in Mon Jan 3 13:47:41 2011
@@ -22,6 +22,8 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/xfr/.libs:@abs_top_builddir@/src/lib/dns/python/.libs
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
-${PYTHON_EXEC} b10-xfrout
-
+exec ${PYTHON_EXEC} b10-xfrout "$@"
Modified: branches/trac384/src/bin/xfrout/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/xfrout/tests/Makefile.am (original)
+++ branches/trac384/src/bin/xfrout/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,3 +1,4 @@
+PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = xfrout_test.py
EXTRA_DIST = $(PYTESTS)
@@ -8,13 +9,16 @@
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$(abs_top_builddir)/src/lib/xfr/.libs:$$$(ENV_LIBRARY_PATH)
endif
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/xfrout:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
$(LIBRARY_PATH_PLACEHOLDER) \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/bin/zonemgr/run_b10-zonemgr.sh.in
==============================================================================
--- branches/trac384/src/bin/zonemgr/run_b10-zonemgr.sh.in (original)
+++ branches/trac384/src/bin/zonemgr/run_b10-zonemgr.sh.in Mon Jan 3 13:47:41 2011
@@ -22,6 +22,8 @@
PYTHONPATH=@abs_top_srcdir@/src/lib/python:@abs_top_builddir@/src/lib/dns/.libs
export PYTHONPATH
+BIND10_MSGQ_SOCKET_FILE=@abs_top_builddir@/msgq_socket
+export BIND10_MSGQ_SOCKET_FILE
+
cd ${MYPATH_PATH}
-${PYTHON_EXEC} b10-zonemgr
-
+exec ${PYTHON_EXEC} b10-zonemgr "$@"
Modified: branches/trac384/src/bin/zonemgr/tests/Makefile.am
==============================================================================
--- branches/trac384/src/bin/zonemgr/tests/Makefile.am (original)
+++ branches/trac384/src/bin/zonemgr/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,14 +1,17 @@
+PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = zonemgr_test.py
EXTRA_DIST = $(PYTESTS)
-
CLEANFILES = initdb.file
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_builddir)/src/bin/zonemgr:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/dns/python/.libs:$(abs_top_builddir)/src/lib/xfr/.libs \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/asiolink/asiolink.cc
==============================================================================
--- branches/trac384/src/lib/asiolink/asiolink.cc (original)
+++ branches/trac384/src/lib/asiolink/asiolink.cc Mon Jan 3 13:47:41 2011
@@ -26,6 +26,7 @@
#include <asio.hpp>
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <boost/shared_ptr.hpp>
@@ -374,4 +375,90 @@
timeout_, retries_);
}
-}
+class IntervalTimerImpl {
+private:
+ // prohibit copy
+ IntervalTimerImpl(const IntervalTimerImpl& source);
+ IntervalTimerImpl& operator=(const IntervalTimerImpl& source);
+public:
+ IntervalTimerImpl(IOService& io_service);
+ ~IntervalTimerImpl();
+ void setupTimer(const IntervalTimer::Callback& cbfunc,
+ const uint32_t interval);
+ void callback(const asio::error_code& error);
+private:
+ // a function to update timer_ when it expires
+ void updateTimer();
+ // a function to call back when timer_ expires
+ IntervalTimer::Callback cbfunc_;
+ // interval in seconds
+ uint32_t interval_;
+ // asio timer
+ asio::deadline_timer timer_;
+};
+
+IntervalTimerImpl::IntervalTimerImpl(IOService& io_service) :
+ timer_(io_service.get_io_service())
+{}
+
+IntervalTimerImpl::~IntervalTimerImpl()
+{}
+
+void
+IntervalTimerImpl::setupTimer(const IntervalTimer::Callback& cbfunc,
+ const uint32_t interval)
+{
+ // Interval should not be 0.
+ if (interval == 0) {
+ isc_throw(isc::BadValue, "Interval should not be 0");
+ }
+ // Call back function should not be empty.
+ if (cbfunc.empty()) {
+ isc_throw(isc::InvalidParameter, "Callback function is empty");
+ }
+ cbfunc_ = cbfunc;
+ interval_ = interval;
+ // Set initial expire time.
+ // At this point the timer is not running yet and will not expire.
+ // After calling IOService::run(), the timer will expire.
+ updateTimer();
+ return;
+}
+
+void
+IntervalTimerImpl::updateTimer() {
+ try {
+ // Update expire time to (current time + interval_).
+ timer_.expires_from_now(boost::posix_time::seconds(interval_));
+ } catch (const asio::system_error& e) {
+ isc_throw(isc::Unexpected, "Failed to update timer");
+ }
+ // Reset timer.
+ timer_.async_wait(boost::bind(&IntervalTimerImpl::callback, this, _1));
+}
+
+void
+IntervalTimerImpl::callback(const asio::error_code& cancelled) {
+ // Do not call cbfunc_ in case the timer was cancelled.
+ // The timer will be canelled in the destructor of asio::deadline_timer.
+ if (!cancelled) {
+ cbfunc_();
+ // Set next expire time.
+ updateTimer();
+ }
+}
+
+IntervalTimer::IntervalTimer(IOService& io_service) {
+ impl_ = new IntervalTimerImpl(io_service);
+}
+
+IntervalTimer::~IntervalTimer() {
+ delete impl_;
+}
+
+void
+IntervalTimer::setupTimer(const Callback& cbfunc, const uint32_t interval) {
+ return (impl_->setupTimer(cbfunc, interval));
+}
+
+}
Modified: branches/trac384/src/lib/asiolink/asiolink.h
==============================================================================
--- branches/trac384/src/lib/asiolink/asiolink.h (original)
+++ branches/trac384/src/lib/asiolink/asiolink.h Mon Jan 3 13:47:41 2011
@@ -23,6 +23,7 @@
#include <unistd.h> // for some network system calls
#include <asio/ip/address.hpp>
#include <boost/shared_ptr.hpp>
+#include <boost/function.hpp>
#include <functional>
#include <string>
@@ -98,6 +99,7 @@
namespace asiolink {
class DNSServiceImpl;
struct IOServiceImpl;
+struct IntervalTimerImpl;
/// \brief An exception that is thrown if an error occurs within the IO
/// module. This is mainly intended to be a wrapper exception class for
@@ -233,7 +235,7 @@
/// that share the same \c io_service with the authoritative server.
/// It will eventually be removed once the wrapper interface is
/// generalized.
- asio::io_service& get_io_service() { return io_service_.get_io_service(); };
+ asio::io_service& get_io_service() { return io_service_.get_io_service(); }
private:
DNSServiceImpl* impl_;
IOService& io_service_;
@@ -300,13 +302,13 @@
///
/// \param done If true, this signals the system there is an answer
/// to return.
- virtual inline void resume(const bool done) { self_->resume(done); }
+ virtual void resume(const bool done) { self_->resume(done); }
/// \brief Indicate whether the server is able to send an answer
/// to a query.
///
/// This is presently used only for testing purposes.
- virtual inline bool hasAnswer() { return (self_->hasAnswer()); }
+ virtual bool hasAnswer() { return (self_->hasAnswer()); }
/// \brief Returns the current value of the 'coroutine' object
///
@@ -316,7 +318,7 @@
/// about its current state.
///
/// \return The value of the 'coroutine' object
- virtual inline int value() { return (self_->value()); }
+ virtual int value() { return (self_->value()); }
/// \brief Returns a pointer to a clone of this DNSServer object.
///
@@ -326,7 +328,7 @@
/// that the underlying object is also correctly copied.
///
/// \return A deep copy of this DNSServer object
- virtual inline DNSServer* clone() { return (self_->clone()); }
+ virtual DNSServer* clone() { return (self_->clone()); }
//@}
protected:
@@ -349,7 +351,7 @@
class AsyncLookup {
public:
AsyncLookup(T& caller) : caller_(caller) {}
- inline void operator()() { caller_.asyncLookup(); }
+ void operator()() { caller_.asyncLookup(); }
private:
T caller_;
};
@@ -361,7 +363,7 @@
/// the details of the query and a pointer back to the current
/// server object. It is called asynchronously via the AsyncLookup
/// handler class.
- virtual inline void asyncLookup() { self_->asyncLookup(); }
+ virtual void asyncLookup() { self_->asyncLookup(); }
private:
DNSServer* self_;
@@ -567,6 +569,98 @@
unsigned retries_;
};
+/// \brief The \c IntervalTimer class is a wrapper for the ASIO
+/// \c asio::deadline_timer class.
+///
+/// This class is implemented to use \c asio::deadline_timer as
+/// interval timer.
+///
+/// \c setupTimer() sets a timer to expire on (now + interval) and
+/// a call back function.
+///
+/// \c IntervalTimerImpl::callback() is called by the timer when
+/// it expires.
+///
+/// The function calls the call back function set by \c setupTimer()
+/// and updates the timer to expire in (now + interval) seconds.
+/// The type of call back function is \c void(void).
+///
+/// The call back function will not be called if the instance of this
+/// class is destructed before the timer is expired.
+///
+/// Note: Destruction of an instance of this class while call back
+/// is pending causes throwing an exception from \c IOService.
+///
+/// Sample code:
+/// \code
+/// void function_to_call_back() {
+/// // this function will be called periodically
+/// }
+/// int interval_in_seconds = 1;
+/// IOService io_service;
+///
+/// IntervalTimer intervalTimer(io_service);
+/// intervalTimer.setupTimer(function_to_call_back, interval_in_seconds);
+/// io_service.run();
+/// \endcode
+///
+class IntervalTimer {
+public:
+ /// \name The type of timer callback function
+ typedef boost::function<void()> Callback;
+
+ ///
+ /// \name Constructors and Destructor
+ ///
+ /// Note: The copy constructor and the assignment operator are
+ /// intentionally defined as private, making this class non-copyable.
+ //@{
+private:
+ IntervalTimer(const IntervalTimer& source);
+ IntervalTimer& operator=(const IntervalTimer& source);
+public:
+ /// \brief The constructor with \c IOService.
+ ///
+ /// This constructor may throw a standard exception if
+ /// memory allocation fails inside the method.
+ /// This constructor may also throw \c asio::system_error.
+ ///
+ /// \param io_service A reference to an instance of IOService
+ ///
+ IntervalTimer(IOService& io_service);
+
+ /// \brief The destructor.
+ ///
+ /// This destructor never throws an exception.
+ ///
+ /// On the destruction of this class the timer will be canceled
+ /// inside \c asio::deadline_timer.
+ ///
+ ~IntervalTimer();
+ //@}
+
+ /// \brief Register timer callback function and interval.
+ ///
+ /// This function sets callback function and interval in seconds.
+ /// Timer will actually start after calling \c IOService::run().
+ ///
+ /// \param cbfunc A reference to a function \c void(void) to call back
+ /// when the timer is expired (should not be an empty functor)
+ /// \param interval Interval in seconds (greater than 0)
+ ///
+ /// Note: IntervalTimer will not pass \c asio::error_code to
+ /// call back function. In case the timer is cancelled, the function
+ /// will not be called.
+ ///
+ /// \throw isc::InvalidParameter cbfunc is empty
+ /// \throw isc::BadValue interval is 0
+ /// \throw isc::Unexpected ASIO library error
+ ///
+ void setupTimer(const Callback& cbfunc, const uint32_t interval);
+private:
+ IntervalTimerImpl* impl_;
+};
+
} // asiolink
#endif // __ASIOLINK_H
Modified: branches/trac384/src/lib/asiolink/internal/tcpdns.h
==============================================================================
--- branches/trac384/src/lib/asiolink/internal/tcpdns.h (original)
+++ branches/trac384/src/lib/asiolink/internal/tcpdns.h Mon Jan 3 13:47:41 2011
@@ -79,25 +79,25 @@
~TCPEndpoint() { delete asio_endpoint_placeholder_; }
//@}
- inline IOAddress getAddress() const {
+ IOAddress getAddress() const {
return (asio_endpoint_.address());
}
- inline uint16_t getPort() const {
+ uint16_t getPort() const {
return (asio_endpoint_.port());
}
- inline short getProtocol() const {
+ short getProtocol() const {
return (asio_endpoint_.protocol().protocol());
}
- inline short getFamily() const {
+ short getFamily() const {
return (asio_endpoint_.protocol().family());
}
// This is not part of the exosed IOEndpoint API but allows
// direct access to the ASIO implementation of the endpoint
- inline const asio::ip::tcp::endpoint& getASIOEndpoint() const {
+ const asio::ip::tcp::endpoint& getASIOEndpoint() const {
return (asio_endpoint_);
}
@@ -123,8 +123,8 @@
/// \param socket The ASIO representation of the TCP socket.
TCPSocket(asio::ip::tcp::socket& socket) : socket_(socket) {}
- inline int getNative() const { return (socket_.native()); }
- inline int getProtocol() const { return (IPPROTO_TCP); }
+ int getNative() const { return (socket_.native()); }
+ int getProtocol() const { return (IPPROTO_TCP); }
private:
asio::ip::tcp::socket& socket_;
Modified: branches/trac384/src/lib/asiolink/tests/asiolink_unittest.cc
==============================================================================
--- branches/trac384/src/lib/asiolink/tests/asiolink_unittest.cc (original)
+++ branches/trac384/src/lib/asiolink/tests/asiolink_unittest.cc Mon Jan 3 13:47:41 2011
@@ -21,6 +21,7 @@
#include <boost/lexical_cast.hpp>
#include <boost/bind.hpp>
+#include <boost/date_time/posix_time/posix_time_types.hpp>
#include <gtest/gtest.h>
@@ -54,6 +55,9 @@
// two octets encode the length of the rest of the data. This is crucial
// for the tests below.
const uint8_t test_data[] = {0, 4, 1, 2, 3, 4};
+// TODO: Consider this margin
+const boost::posix_time::time_duration TIMER_MARGIN_MSEC =
+ boost::posix_time::milliseconds(50);
TEST(IOAddressTest, fromText) {
IOAddress io_address_v4("192.0.2.1");
@@ -710,4 +714,247 @@
EXPECT_EQ(3, num);
}
-}
+// This fixture is for testing IntervalTimer. Some callback functors are
+// registered as callback function of the timer to test if they are called
+// or not.
+class IntervalTimerTest : public ::testing::Test {
+protected:
+ IntervalTimerTest() : io_service_() {};
+ ~IntervalTimerTest() {}
+ class TimerCallBack : public std::unary_function<void, void> {
+ public:
+ TimerCallBack(IntervalTimerTest* test_obj) : test_obj_(test_obj) {}
+ void operator()() const {
+ test_obj_->timer_called_ = true;
+ test_obj_->io_service_.stop();
+ return;
+ }
+ private:
+ IntervalTimerTest* test_obj_;
+ };
+ class TimerCallBackCounter : public std::unary_function<void, void> {
+ public:
+ TimerCallBackCounter(IntervalTimerTest* test_obj) : test_obj_(test_obj) {
+ counter_ = 0;
+ }
+ void operator()() {
+ ++counter_;
+ return;
+ }
+ int counter_;
+ private:
+ IntervalTimerTest* test_obj_;
+ };
+ class TimerCallBackCancelDeleter : public std::unary_function<void, void> {
+ public:
+ TimerCallBackCancelDeleter(IntervalTimerTest* test_obj,
+ IntervalTimer* timer,
+ TimerCallBackCounter& counter)
+ : test_obj_(test_obj), timer_(timer), counter_(counter), count_(0)
+ {}
+ void operator()() {
+ ++count_;
+ if (count_ == 1) {
+ // First time of call back.
+ // Store the value of counter_.counter_.
+ prev_counter_ = counter_.counter_;
+ delete timer_;
+ } else if (count_ == 2) {
+ // Second time of call back.
+ // Stop io_service to stop all timers.
+ test_obj_->io_service_.stop();
+ // Compare the value of counter_.counter_ with stored one.
+ // If TimerCallBackCounter was not called (expected behavior),
+ // they are same.
+ if (counter_.counter_ == prev_counter_) {
+ test_obj_->timer_cancel_success_ = true;
+ }
+ }
+ return;
+ }
+ private:
+ IntervalTimerTest* test_obj_;
+ IntervalTimer* timer_;
+ TimerCallBackCounter& counter_;
+ int count_;
+ int prev_counter_;
+ };
+ class TimerCallBackOverwriter : public std::unary_function<void, void> {
+ public:
+ TimerCallBackOverwriter(IntervalTimerTest* test_obj,
+ IntervalTimer& timer)
+ : test_obj_(test_obj), timer_(timer), count_(0)
+ {}
+ void operator()() {
+ ++count_;
+ if (count_ == 1) {
+ // First time of call back.
+ // Call setupTimer() to update callback function
+ // to TimerCallBack.
+ test_obj_->timer_called_ = false;
+ timer_.setupTimer(TimerCallBack(test_obj_), 1);
+ } else if (count_ == 2) {
+ // Second time of call back.
+ // If it reaches here, re-setupTimer() is failed (unexpected).
+ // We should stop here.
+ test_obj_->io_service_.stop();
+ }
+ return;
+ }
+ private:
+ IntervalTimerTest* test_obj_;
+ IntervalTimer& timer_;
+ int count_;
+ };
+protected:
+ IOService io_service_;
+ bool timer_called_;
+ bool timer_cancel_success_;
+};
+
+TEST_F(IntervalTimerTest, invalidArgumentToIntervalTimer) {
+ // Create asio_link::IntervalTimer and setup.
+ IntervalTimer itimer(io_service_);
+ // expect throw if call back function is empty
+ EXPECT_THROW(itimer.setupTimer(IntervalTimer::Callback(), 1),
+ isc::InvalidParameter);
+ // expect throw if interval is 0
+ EXPECT_THROW(itimer.setupTimer(TimerCallBack(this), 0), isc::BadValue);
+}
+
+TEST_F(IntervalTimerTest, startIntervalTimer) {
+ // Create asio_link::IntervalTimer and setup.
+ // Then run IOService and test if the callback function is called.
+ IntervalTimer itimer(io_service_);
+ timer_called_ = false;
+ // store start time
+ boost::posix_time::ptime start;
+ start = boost::posix_time::microsec_clock::universal_time();
+ // setup timer
+ itimer.setupTimer(TimerCallBack(this), 1);
+ io_service_.run();
+ // reaches here after timer expired
+ // delta: difference between elapsed time and 1 second
+ boost::posix_time::time_duration delta =
+ (boost::posix_time::microsec_clock::universal_time() - start)
+ - boost::posix_time::seconds(1);
+ if (delta.is_negative()) {
+ delta.invert_sign();
+ }
+ // expect TimerCallBack is called; timer_called_ is true
+ EXPECT_TRUE(timer_called_);
+ // expect interval is 1 second +/- TIMER_MARGIN_MSEC.
+ EXPECT_TRUE(delta < TIMER_MARGIN_MSEC);
+}
+
+TEST_F(IntervalTimerTest, destructIntervalTimer) {
+ // Note: This test currently takes 6 seconds. The timer should have
+ // finer granularity and timer periods in this test should be shorter
+ // in the future.
+ // This code isn't exception safe, but we'd rather keep the code
+ // simpler and more readable as this is only for tests and if it throws
+ // the program would immediately terminate anyway.
+
+ // The call back function will not be called after the timer is
+ // destructed.
+ //
+ // There are two timers:
+ // itimer_counter (A)
+ // (Calls TimerCallBackCounter)
+ // - increments internal counter in callback function
+ // itimer_canceller (B)
+ // (Calls TimerCallBackCancelDeleter)
+ // - first time of callback, it stores the counter value of
+ // callback_canceller and destructs itimer_counter
+ // - second time of callback, it compares the counter value of
+ // callback_canceller with stored value
+ // if they are same the timer was not called; expected result
+ // if they are different the timer was called after destructed
+ //
+ // 0 1 2 3 4 5 6 (s)
+ // (A) i-----+--x
+ // ^
+ // |destruct itimer_counter
+ // (B) i--------+--------s
+ // ^stop io_service
+ // and test itimer_counter have been stopped
+ //
+
+ // itimer_counter will be deleted in TimerCallBackCancelDeleter
+ IntervalTimer* itimer_counter = new IntervalTimer(io_service_);
+ IntervalTimer itimer_canceller(io_service_);
+ timer_cancel_success_ = false;
+ TimerCallBackCounter callback_canceller(this);
+ itimer_counter->setupTimer(callback_canceller, 2);
+ itimer_canceller.setupTimer(
+ TimerCallBackCancelDeleter(this, itimer_counter,
+ callback_canceller),
+ 3);
+ io_service_.run();
+ EXPECT_TRUE(timer_cancel_success_);
+}
+
+TEST_F(IntervalTimerTest, overwriteIntervalTimer) {
+ // Note: This test currently takes 4 seconds. The timer should have
+ // finer granularity and timer periods in this test should be shorter
+ // in the future.
+
+ // Calling setupTimer() multiple times updates call back function
+ // and interval.
+ //
+ // There are two timers:
+ // itimer (A)
+ // (Calls TimerCallBackCounter / TimerCallBack)
+ // - increments internal counter in callback function
+ // (TimerCallBackCounter)
+ // interval: 2 seconds
+ // - io_service_.stop() (TimerCallBack)
+ // interval: 1 second
+ // itimer_overwriter (B)
+ // (Calls TimerCallBackOverwriter)
+ // - first time of callback, it calls setupTimer() to change
+ // call back function and interval of itimer to
+ // TimerCallBack / 1 second
+ // after 3 + 1 seconds from the beginning of this test,
+ // TimerCallBack() will be called and io_service_ stops.
+ // - second time of callback, it means the test fails.
+ //
+ // 0 1 2 3 4 5 6 (s)
+ // (A) i-----+--C--s
+ // ^ ^stop io_service
+ // |change call back function
+ // (B) i--------+--------S
+ // ^(stop io_service on fail)
+ //
+
+ IntervalTimer itimer(io_service_);
+ IntervalTimer itimer_overwriter(io_service_);
+ // store start time
+ boost::posix_time::ptime start;
+ start = boost::posix_time::microsec_clock::universal_time();
+ itimer.setupTimer(TimerCallBackCounter(this), 2);
+ itimer_overwriter.setupTimer(TimerCallBackOverwriter(this, itimer), 3);
+ io_service_.run();
+ // reaches here after timer expired
+ // if interval is updated, it takes
+ // 3 seconds for TimerCallBackOverwriter
+ // + 1 second for TimerCallBack (stop)
+ // = 4 seconds.
+ // otherwise (test fails), it takes
+ // 3 seconds for TimerCallBackOverwriter
+ // + 3 seconds for TimerCallBackOverwriter (stop)
+ // = 6 seconds.
+ // delta: difference between elapsed time and 3 + 1 seconds
+ boost::posix_time::time_duration delta =
+ (boost::posix_time::microsec_clock::universal_time() - start)
+ - boost::posix_time::seconds(3 + 1);
+ if (delta.is_negative()) {
+ delta.invert_sign();
+ }
+ // expect callback function is updated: TimerCallBack is called
+ EXPECT_TRUE(timer_called_);
+ // expect interval is updated
+ EXPECT_TRUE(delta < TIMER_MARGIN_MSEC);
+}
+
+}
Modified: branches/trac384/src/lib/config/module_spec.cc
==============================================================================
--- branches/trac384/src/lib/config/module_spec.cc (original)
+++ branches/trac384/src/lib/config/module_spec.cc Mon Jan 3 13:47:41 2011
@@ -330,14 +330,33 @@
ModuleSpec::validate_spec_list(ConstElementPtr spec, ConstElementPtr data,
const bool full, ElementPtr errors) const
{
+ bool validated = true;
std::string cur_item_name;
BOOST_FOREACH(ConstElementPtr cur_spec_el, spec->listValue()) {
if (!validate_spec(cur_spec_el, data, full, errors)) {
- return (false);
- }
- }
- return (true);
-}
-
-}
-}
+ validated = false;
+ }
+ }
+
+ typedef std::pair<std::string, ConstElementPtr> maptype;
+
+ BOOST_FOREACH(maptype m, data->mapValue()) {
+ bool found = false;
+ BOOST_FOREACH(ConstElementPtr cur_spec_el, spec->listValue()) {
+ if (cur_spec_el->get("item_name")->stringValue().compare(m.first) == 0) {
+ found = true;
+ }
+ }
+ if (!found) {
+ validated = false;
+ if (errors) {
+ errors->add(Element::create("Unknown item " + m.first));
+ }
+ }
+ }
+
+ return (validated);
+}
+
+}
+}
Modified: branches/trac384/src/lib/config/tests/module_spec_unittests.cc
==============================================================================
--- branches/trac384/src/lib/config/tests/module_spec_unittests.cc (original)
+++ branches/trac384/src/lib/config/tests/module_spec_unittests.cc Mon Jan 3 13:47:41 2011
@@ -166,8 +166,13 @@
EXPECT_TRUE(data_test(dd, "data22_6.data"));
EXPECT_TRUE(data_test(dd, "data22_7.data"));
EXPECT_FALSE(data_test(dd, "data22_8.data"));
+ EXPECT_FALSE(data_test(dd, "data22_9.data"));
ElementPtr errors = Element::createList();
EXPECT_FALSE(data_test_with_errors(dd, "data22_8.data", errors));
EXPECT_EQ("[ \"Type mismatch\" ]", errors->str());
+
+ errors = Element::createList();
+ EXPECT_FALSE(data_test_with_errors(dd, "data22_9.data", errors));
+ EXPECT_EQ("[ \"Unknown item value_does_not_exist\" ]", errors->str());
}
Modified: branches/trac384/src/lib/config/tests/testdata/Makefile.am
==============================================================================
--- branches/trac384/src/lib/config/tests/testdata/Makefile.am (original)
+++ branches/trac384/src/lib/config/tests/testdata/Makefile.am Mon Jan 3 13:47:41 2011
@@ -20,6 +20,7 @@
EXTRA_DIST += data22_6.data
EXTRA_DIST += data22_7.data
EXTRA_DIST += data22_8.data
+EXTRA_DIST += data22_9.data
EXTRA_DIST += spec1.spec
EXTRA_DIST += spec2.spec
EXTRA_DIST += spec3.spec
Modified: branches/trac384/src/lib/config/tests/testdata/data22_8.data
==============================================================================
--- branches/trac384/src/lib/config/tests/testdata/data22_8.data (original)
+++ branches/trac384/src/lib/config/tests/testdata/data22_8.data Mon Jan 3 13:47:41 2011
@@ -5,5 +5,6 @@
"value4": "foo",
"value5": [ 1, 2, 3 ],
"value6": { "v61": "bar", "v62": true },
- "value8": [ { "a": "d" }, { "a": 1 } ]
+ "value8": [ { "a": "d" }, { "a": 1 } ],
+ "value9": { "v91": "hi", "v92": { "v92a": "Hi", "v92b": 3 } }
}
Modified: branches/trac384/src/lib/datasrc/Makefile.am
==============================================================================
--- branches/trac384/src/lib/datasrc/Makefile.am (original)
+++ branches/trac384/src/lib/datasrc/Makefile.am Mon Jan 3 13:47:41 2011
@@ -15,6 +15,8 @@
libdatasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
libdatasrc_la_SOURCES += query.h query.cc
libdatasrc_la_SOURCES += cache.h cache.cc
-libdatasrc_la_SOURCES += rbtree.h
+libdatasrc_la_SOURCES += rbtree.h
libdatasrc_la_SOURCES += zonetable.h zonetable.cc
libdatasrc_la_SOURCES += memory_datasrc.h memory_datasrc.cc
+libdatasrc_la_SOURCES += zone.h
+libdatasrc_la_SOURCES += result.h
Modified: branches/trac384/src/lib/datasrc/data_source.h
==============================================================================
--- branches/trac384/src/lib/datasrc/data_source.h (original)
+++ branches/trac384/src/lib/datasrc/data_source.h Mon Jan 3 13:47:41 2011
@@ -248,7 +248,7 @@
void addDataSrc(ConstDataSrcPtr data_src);
void removeDataSrc(ConstDataSrcPtr data_src);
size_t dataSrcCount() { return (data_sources.size()); }
-
+
void findClosestEnclosure(DataSrcMatch& match) const;
// Actual queries for data should not be sent to a MetaDataSrc object,
Modified: branches/trac384/src/lib/datasrc/memory_datasrc.cc
==============================================================================
--- branches/trac384/src/lib/datasrc/memory_datasrc.cc (original)
+++ branches/trac384/src/lib/datasrc/memory_datasrc.cc Mon Jan 3 13:47:41 2011
@@ -12,14 +12,272 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
+#include <map>
+#include <cassert>
+#include <boost/shared_ptr.hpp>
+#include <boost/bind.hpp>
+
#include <dns/name.h>
+#include <dns/rrclass.h>
+#include <dns/masterload.h>
+
#include <datasrc/memory_datasrc.h>
+#include <datasrc/rbtree.h>
using namespace std;
using namespace isc::dns;
namespace isc {
namespace datasrc {
+
+// Private data and hidden methods of MemoryZone
+struct MemoryZone::MemoryZoneImpl {
+ // Constructor
+ MemoryZoneImpl(const RRClass& zone_class, const Name& origin) :
+ zone_class_(zone_class), origin_(origin)
+ {}
+
+ // Information about the zone
+ RRClass zone_class_;
+ Name origin_;
+
+ // Some type aliases
+ /*
+ * Each domain consists of some RRsets. They will be looked up by the
+ * RRType.
+ *
+ * The use of map is questionable with regard to performance - there'll
+ * be usually only few RRsets in the domain, so the log n benefit isn't
+ * much and a vector/array might be faster due to its simplicity and
+ * continuous memory location. But this is unlikely to be a performance
+ * critical place and map has better interface for the lookups, so we use
+ * that.
+ */
+ typedef map<RRType, ConstRRsetPtr> Domain;
+ typedef Domain::value_type DomainPair;
+ typedef boost::shared_ptr<Domain> DomainPtr;
+ // The tree stores domains
+ typedef RBTree<Domain> DomainTree;
+ typedef RBNode<Domain> DomainNode;
+ // The actual zone data
+ DomainTree domains_;
+
+ /*
+ * Implementation of longer methods. We put them here, because the
+ * access is without the impl_-> and it will get inlined anyway.
+ */
+ // Implementation of MemoryZone::add
+ result::Result add(const ConstRRsetPtr& rrset, DomainTree* domains) {
+ // Sanitize input
+ if (!rrset) {
+ isc_throw(NullRRset, "The rrset provided is NULL");
+ }
+ Name name(rrset->getName());
+ NameComparisonResult compare(origin_.compare(name));
+ if (compare.getRelation() != NameComparisonResult::SUPERDOMAIN &&
+ compare.getRelation() != NameComparisonResult::EQUAL)
+ {
+ isc_throw(OutOfZone, "The name " << name <<
+ " is not contained in zone " << origin_);
+ }
+ // Get the node
+ DomainNode* node;
+ switch (domains->insert(name, &node)) {
+ // Just check it returns reasonable results
+ case DomainTree::SUCCEED:
+ case DomainTree::ALREADYEXIST:
+ break;
+ // Something odd got out
+ default:
+ assert(0);
+ }
+ assert(node);
+
+ // Now get the domain
+ DomainPtr domain;
+ // It didn't exist yet, create it
+ if (node->isEmpty()) {
+ domain.reset(new Domain);
+ node->setData(domain);
+ } else { // Get existing one
+ domain = node->getData();
+ }
+
+ // Try inserting the rrset there
+ if (domain->insert(DomainPair(rrset->getType(), rrset)).second) {
+ // Ok, we just put it in
+
+ // If this RRset creates a zone cut at this node, mark the node
+ // indicating the need for callback in find().
+ // TBD: handle DNAME, too
+ if (rrset->getType() == RRType::NS() &&
+ rrset->getName() != origin_) {
+ node->enableCallback();
+ }
+
+ return (result::SUCCESS);
+ } else {
+ // The RRSet of given type was already there
+ return (result::EXIST);
+ }
+ }
+
+ /*
+ * Same as above, but it checks the return value and if it already exists,
+ * it throws.
+ */
+ void addFromLoad(const ConstRRsetPtr& set, DomainTree* domains) {
+ switch (add(set, domains)) {
+ case result::EXIST:
+ isc_throw(dns::MasterLoadError, "Duplicate rrset: " <<
+ set->toText());
+ case result::SUCCESS:
+ return;
+ default:
+ assert(0);
+ }
+ }
+
+ // Maintain intermediate data specific to the search context used in
+ /// \c find().
+ ///
+ /// It will be passed to \c zonecutCallback() and record a possible
+ /// zone cut node and related RRset (normally NS or DNAME).
+ struct FindState {
+ FindState(FindOptions options) : zonecut_node_(NULL),
+ options_(options)
+ {}
+ const DomainNode* zonecut_node_;
+ ConstRRsetPtr rrset_;
+ const FindOptions options_;
+ };
+
+ // A callback called from possible zone cut nodes. This will be passed
+ // from the \c find() method to \c RBTree::find().
+ static bool zonecutCallback(const DomainNode& node, FindState* state) {
+ // We perform callback check only for the highest zone cut in the
+ // rare case of nested zone cuts.
+ if (state->zonecut_node_ != NULL) {
+ return (false);
+ }
+
+ const Domain::const_iterator found(node.getData()->find(RRType::NS()));
+ if (found != node.getData()->end()) {
+ // BIND 9 checks if this node is not the origin. But it cannot
+ // be the origin because we don't enable the callback at the
+ // origin node (see MemoryZoneImpl::add()). Or should we do a
+ // double check for it?
+ state->zonecut_node_ = &node;
+ state->rrset_ = found->second;
+
+ // Unless glue is allowed the search stops here, so we return
+ // false; otherwise return true to continue the search.
+ return ((state->options_ & FIND_GLUE_OK) == 0);
+ }
+
+ // This case should not happen because we enable callback only
+ // when we add an RR searched for above.
+ assert(0);
+ // This is here to avoid warning (therefore compilation error)
+ // in case assert is turned off. Otherwise we could get "Control
+ // reached end of non-void function".
+ return (false);
+ }
+
+ // Implementation of MemoryZone::find
+ FindResult find(const Name& name, RRType type,
+ const FindOptions options) const
+ {
+ // Get the node
+ DomainNode* node(NULL);
+ FindState state(options);
+ switch (domains_.find(name, &node, zonecutCallback, &state)) {
+ case DomainTree::PARTIALMATCH:
+ if (state.zonecut_node_ != NULL) {
+ return (FindResult(DELEGATION, state.rrset_));
+ }
+ // TODO: we should also cover empty non-terminal cases, which
+ // will require non trivial code and is deferred for later
+ // development. For now, we regard any partial match that
+ // didn't hit a zone cut as "not found".
+ case DomainTree::NOTFOUND:
+ return (FindResult(NXDOMAIN, ConstRRsetPtr()));
+ case DomainTree::EXACTMATCH: // This one is OK, handle it
+ break;
+ default:
+ assert(0);
+ }
+ assert(node);
+ assert(!node->isEmpty());
+
+ Domain::const_iterator found;
+
+ // If the node callback is enabled, this may be a zone cut. If it
+ // has a NS RR, we should return a delegation.
+ if (node->isCallbackEnabled()) {
+ found = node->getData()->find(RRType::NS());
+ if (found != node->getData()->end()) {
+ return (FindResult(DELEGATION, found->second));
+ }
+ }
+
+ found = node->getData()->find(type);
+ if (found != node->getData()->end()) {
+ // Good, it is here
+ return (FindResult(SUCCESS, found->second));
+ } else {
+ /*
+ * TODO Look for CNAME and DNAME (it should be OK to do so when
+ * the value is not found, as CNAME/DNAME domain should be
+ * empty otherwise.)
+ */
+ return (FindResult(NXRRSET, ConstRRsetPtr()));
+ }
+ }
+};
+
+MemoryZone::MemoryZone(const RRClass& zone_class, const Name& origin) :
+ impl_(new MemoryZoneImpl(zone_class, origin))
+{
+}
+
+MemoryZone::~MemoryZone() {
+ delete impl_;
+}
+
+const Name&
+MemoryZone::getOrigin() const {
+ return (impl_->origin_);
+}
+
+const RRClass&
+MemoryZone::getClass() const {
+ return (impl_->zone_class_);
+}
+
+Zone::FindResult
+MemoryZone::find(const Name& name, const RRType& type,
+ const FindOptions options) const
+{
+ return (impl_->find(name, type, options));
+}
+
+result::Result
+MemoryZone::add(const ConstRRsetPtr& rrset) {
+ return (impl_->add(rrset, &impl_->domains_));
+}
+
+
+void
+MemoryZone::load(const string& filename) {
+ // Load it into a temporary tree
+ MemoryZoneImpl::DomainTree tmp;
+ masterLoad(filename.c_str(), getOrigin(), getClass(),
+ boost::bind(&MemoryZoneImpl::addFromLoad, impl_, _1, &tmp));
+ // If it went well, put it inside
+ tmp.swap(impl_->domains_);
+ // And let the old data die with tmp
+}
/// Implementation details for \c MemoryDataSrc hidden from the public
/// interface.
@@ -27,7 +285,10 @@
/// For now, \c MemoryDataSrc only contains a \c ZoneTable object, which
/// consists of (pointers to) \c MemoryZone objects, we may add more
/// member variables later for new features.
-struct MemoryDataSrc::MemoryDataSrcImpl {
+class MemoryDataSrc::MemoryDataSrcImpl {
+public:
+ MemoryDataSrcImpl() : zone_count(0) {}
+ unsigned int zone_count;
ZoneTable zone_table;
};
@@ -36,6 +297,11 @@
MemoryDataSrc::~MemoryDataSrc() {
delete impl_;
+}
+
+unsigned int
+MemoryDataSrc::getZoneCount() const {
+ return (impl_->zone_count);
}
result::Result
@@ -44,7 +310,12 @@
isc_throw(InvalidParameter,
"Null pointer is passed to MemoryDataSrc::addZone()");
}
- return (impl_->zone_table.addZone(zone));
+
+ const result::Result result = impl_->zone_table.addZone(zone);
+ if (result == result::SUCCESS) {
+ ++impl_->zone_count;
+ }
+ return (result);
}
MemoryDataSrc::FindResult
Modified: branches/trac384/src/lib/datasrc/memory_datasrc.h
==============================================================================
--- branches/trac384/src/lib/datasrc/memory_datasrc.h (original)
+++ branches/trac384/src/lib/datasrc/memory_datasrc.h Mon Jan 3 13:47:41 2011
@@ -24,6 +24,112 @@
namespace datasrc {
+/// A derived zone class intended to be used with the memory data source.
+class MemoryZone : public Zone {
+ ///
+ /// \name Constructors and Destructor.
+ ///
+ /// \b Note:
+ /// The copy constructor and the assignment operator are intentionally
+ /// defined as private, making this class non copyable.
+ //@{
+private:
+ MemoryZone(const MemoryZone& source);
+ MemoryZone& operator=(const MemoryZone& source);
+public:
+ /// \brief Constructor from zone parameters.
+ ///
+ /// This constructor internally involves resource allocation, and if
+ /// it fails, a corresponding standard exception will be thrown.
+ /// It never throws an exception otherwise.
+ ///
+ /// \param rrclass The RR class of the zone.
+ /// \param origin The origin name of the zone.
+ MemoryZone(const isc::dns::RRClass& rrclass, const isc::dns::Name& origin);
+
+ /// The destructor.
+ virtual ~MemoryZone();
+ //@}
+
+ /// \brief Returns the origin of the zone.
+ virtual const isc::dns::Name& getOrigin() const;
+ /// \brief Returns the class of the zone.
+ virtual const isc::dns::RRClass& getClass() const;
+ /// \brief Looks up an RRset in the zone.
+ ///
+ /// See documentation in \c Zone.
+ ///
+ /// It returns NULL pointer in case of NXDOMAIN and NXRRSET
+ /// (the base class documentation does not seem to require that).
+ virtual FindResult find(const isc::dns::Name& name,
+ const isc::dns::RRType& type,
+ const FindOptions options = FIND_DEFAULT) const;
+
+ /// \brief Inserts an rrset into the zone.
+ ///
+ /// It puts another RRset into the zone.
+ ///
+ /// It throws NullRRset or OutOfZone if the provided rrset is invalid. It
+ /// might throw standard allocation exceptions, in which case this function
+ /// does not guarantee strong exception safety (it is currently not needed,
+ /// if it is needed in future, it should be implemented).
+ ///
+ /// \param rrset The set to add.
+ /// \return SUCCESS or EXIST (if an rrset for given name and type already
+ /// exists).
+ result::Result add(const isc::dns::ConstRRsetPtr& rrset);
+
+ /// \brief RRSet out of zone exception.
+ ///
+ /// This is thrown if addition of an RRset that doesn't belong under the
+ /// zone's origin is requested.
+ struct OutOfZone : public InvalidParameter {
+ OutOfZone(const char* file, size_t line, const char* what) :
+ InvalidParameter(file, line, what)
+ { }
+ };
+
+ /// \brief RRset is NULL exception.
+ ///
+ /// This is thrown if the provided RRset parameter is NULL.
+ struct NullRRset : public InvalidParameter {
+ NullRRset(const char* file, size_t line, const char* what) :
+ InvalidParameter(file, line, what)
+ { }
+ };
+
+ /// \brief Load zone from masterfile.
+ ///
+ /// This loads data from masterfile specified by filename. It replaces
+ /// current content. The masterfile parsing ability is kind of limited,
+ /// see isc::dns::masterLoad.
+ ///
+ /// This throws isc::dns::MasterLoadError if there is problem with loading
+ /// (missing file, malformed, it contains different zone, etc - see
+ /// isc::dns::masterLoad for details).
+ ///
+ /// In case of internal problems, OutOfZone, NullRRset or AssertError could
+ /// be thrown, but they should not be expected. Exceptions caused by
+ /// allocation may be thrown as well.
+ ///
+ /// If anything is thrown, the previous content is preserved (so it can
+ /// be used to update the data, but if user makes a typo, the old one
+ /// is kept).
+ ///
+ /// \param filename The master file to load.
+ ///
+ /// \todo We may need to split it to some kind of build and commit/abort.
+ /// This will probably be needed when a better implementation of
+ /// configuration reloading is written.
+ void load(const std::string& filename);
+private:
+ /// \name Hidden private data
+ //@{
+ struct MemoryZoneImpl;
+ MemoryZoneImpl* impl_;
+ //@}
+};
+
/// \brief A data source that uses in memory dedicated backend.
///
/// The \c MemoryDataSrc class represents a data source and provides a
@@ -103,6 +209,13 @@
/// The destructor.
~MemoryDataSrc();
//@}
+
+ /// Return the number of zones stored in the data source.
+ ///
+ /// This method never throws an exception.
+ ///
+ /// \return The number of zones stored in the data source.
+ unsigned int getZoneCount() const;
/// Add a \c Zone to the \c MemoryDataSrc.
///
@@ -140,7 +253,7 @@
FindResult findZone(const isc::dns::Name& name) const;
private:
- struct MemoryDataSrcImpl;
+ class MemoryDataSrcImpl;
MemoryDataSrcImpl* impl_;
};
}
Modified: branches/trac384/src/lib/datasrc/rbtree.h
==============================================================================
--- branches/trac384/src/lib/datasrc/rbtree.h (original)
+++ branches/trac384/src/lib/datasrc/rbtree.h Mon Jan 3 13:47:41 2011
@@ -38,8 +38,11 @@
/// Helper function to remove the base domain from super domain
///
/// the precondition of this function is the super_name contains the
-/// sub_name so \code Name a("a.b.c"); Name b("b.c");
-/// Name c = a - b; \\c will be "a" \endcode
+/// sub_name so
+/// \code Name a("a.b.c");
+/// Name b("b.c");
+/// Name c = a - b;
+/// \endcode
///
/// \note function in this namespace is not intended to be used outside.
inline isc::dns::Name
@@ -51,8 +54,9 @@
template <typename T>
class RBTree;
+
/// \brief \c RBNode use by RBTree to store any data related to one domain name
-
+///
/// It has two roles, the first one is as one node in the \c RBTree,
/// the second one is to store the data related to one domain name and maintain
/// the domain name hierarchy struct in one domain name space.
@@ -74,11 +78,11 @@
friend class RBTree<T>;
typedef boost::shared_ptr<T> NodeDataPtr;
- /// \name Deonstructor
+ /// \name Destructor
/// \note it's seems a little strange that constructor is private
/// but deconstructor left public, the reason is for some smart pointer
/// like std::auto_ptr, they needs to delete RBNode in sometimes, but
- /// \code delete *pointer_to_node \codeend shouldn't be called directly
+ /// \code delete *pointer_to_node \endcode shouldn't be called directly
//@{
~RBNode();
//@}
@@ -111,6 +115,24 @@
void setData(const NodeDataPtr& data) { data_ = data; }
//@}
+ /// \name Callback related methods
+ ///
+ /// See the description of \c RBTree<T>::find() about callbacks.
+ ///
+ /// These methods never throw an exception.
+ //@{
+ /// Return if callback is enabled at the node.
+ ///
+ /// This method never throws an exception.
+ bool isCallbackEnabled() const { return (callback_required_); }
+
+ /// Enable callback at the node.
+ void enableCallback() { callback_required_ = true; }
+
+ /// Disable callback at the node.
+ void disableCallback() { callback_required_ = false; }
+ //@}
+
private:
/// \brief Define rbnode color
@@ -147,6 +169,7 @@
isc::dns::Name name_;
NodeDataPtr data_;
+
/// the down pointer points to the root node of sub domains of current
/// domain
/// \par Adding down pointer to \c RBNode is for two purpose:
@@ -154,6 +177,10 @@
/// big flat tree into several hierarchy trees
/// \li It save memory useage, so same label won't be saved several times
RBNode<T>* down_;
+
+ // If true, callback should be called at this node in search.
+ // (This may have to become part of more general "attribute flags")
+ bool callback_required_;
};
@@ -167,7 +194,8 @@
color_(BLACK),
// dummy name, the value doesn't matter:
name_(isc::dns::Name::ROOT_NAME()),
- down_(this)
+ down_(this),
+ callback_required_(false)
{
}
@@ -178,7 +206,8 @@
right_(NULL_NODE()),
color_(RED),
name_(name),
- down_(NULL_NODE())
+ down_(NULL_NODE()),
+ callback_required_(false)
{
}
@@ -186,51 +215,55 @@
template <typename T>
RBNode<T>::~RBNode() {
}
-/// \brief \c RBTree class represents all the domains with the same suffix,
-/// so it can be used to store the domains in one zone.
-///
-/// \c RBTree is a generic red black tree, and contains all the nodes with
-/// the same suffix, since each name may have sub domain names
-/// so \c RBTree is a recursive data structure namely tree in tree.
-/// So for one zone, several RBTrees may be involved. But from outside, the sub
-/// tree is opaque for end users.
-///
-/// \c RBTree split the domain space into hierarchy red black trees, nodes in one
-/// tree has the same base name. The benefit of this struct is that:
-/// - enhance the query performace compared with one big flat red black tree
-/// - decrase the memory footprint to save common labels only once.
-
-/*
-/// \verbatim
-/// with the following names:
-/// a x.d.e.f o.w.y.d.e.f
-/// b z.d.e.f p.w.y.d.e.f
-/// c g.h q.w.y.d.e.f
-/// the tree will looks like:
-/// b
-/// / \
-/// a d.e.f
-/// /|\
-/// c | g.h
-/// |
-/// w.y
-/// /|\
-/// x | z
-/// |
-/// p
-/// / \
-/// o q
-/// \endverbatim
-/// \note open problems:
-/// - current find funciton only return non-empty nodes, so there is no difference
-/// between find one not exist name with empty non-terminal nodes, but in DNS query
-/// logic, they are different
-/// \todo
-/// - add remove interface
-/// - add iterator to iterate the whole rbtree while may needed by axfr
-/// - since \c RBNode only has down pointer without up pointer, the node path during finding
-/// should be recorded for later use
-*/
+
+// note: the following class description is documented using C-style comments
+// because the verbatim diagram contain a backslash, which could be interpreted
+// as part of a multi-line comment with C++ style comments.
+/**
+ * \brief \c RBTree class represents all the domains with the same suffix,
+ * so it can be used to store the domains in one zone.
+ *
+ * \c RBTree is a generic red black tree, and contains all the nodes with
+ * the same suffix, since each name may have sub domain names
+ * so \c RBTree is a recursive data structure namely tree in tree.
+ * So for one zone, several RBTrees may be involved. But from outside, the sub
+ * tree is opaque for end users.
+ *
+ * \c RBTree split the domain space into hierarchy red black trees, nodes in one
+ * tree has the same base name. The benefit of this struct is that:
+ * - enhance the query performace compared with one big flat red black tree
+ * - decrase the memory footprint to save common labels only once.
+ *
+ * \verbatim
+ with the following names:
+ a x.d.e.f o.w.y.d.e.f
+ b z.d.e.f p.w.y.d.e.f
+ c g.h q.w.y.d.e.f
+ the tree will looks like:
+ b
+ / \
+ a d.e.f
+ /|\
+ c | g.h
+ |
+ w.y
+ /|\
+ x | z
+ |
+ p
+ / \
+ o q
+ * \endverbatim
+ * \note open problems:
+ * - current find funciton only return non-empty nodes, so there is no difference
+ * between find one not exist name with empty non-terminal nodes, but in DNS query
+ * logic, they are different
+ * \todo
+ * - add remove interface
+ * - add iterator to iterate the whole rbtree while may needed by axfr
+ * - since \c RBNode only has down pointer without up pointer, the node path during finding
+ * should be recorded for later use
+ */
template <typename T>
class RBTree : public boost::noncopyable {
friend class RBNode<T>;
@@ -247,7 +280,7 @@
/// \name Constructor and Destructor
//@{
- RBTree();
+ explicit RBTree();
/// \b Note: RBTree is not intended to be inherited so the destructor
/// is not virtual
@@ -256,13 +289,98 @@
/// \name Inquery methods
//@{
- /// \brief Find the node with the name
+ /// \brief Find the node that gives a longest match against the given name
+ ///
+ /// This method searches the \c RBTree for a node whose name is a longest
+ /// match against \c name. The found node, if any, is returned via the
+ /// \c node pointer.
+ /// By default, nodes that don't have data will be ignored, and the result
+ /// can be \c NOTFOUND even if there is a node whose name matches the
+ /// given \c name.
+ /// We'll soon introduce a "no data OK" mode in this method. It would
+ /// match any node of the tree regardless of whether the node has data
+ /// or not.
+ /// Since the tree is "compressed", i.e., a node can contain multiple
+ /// name labels, there are counter intuitive cases in the "no data OK"
+ /// mode. For example, see the diagram of the class description.
+ /// Name "y.d.e.f" is logically contained in the tree as part of the
+ /// "compressed" node of "w.y". But the search logic of this method
+ /// cannot find the logical match, and would return a \c PARTIALMATCH
+ /// result pointing to node "d.e.f". To correctly identify the real
+ /// longest match, "y.d.e.f" with empty data, the caller needs to
+ /// perform additional steps.
+ ///
+ /// This version of \c find() method is templated to allow the caller
+ /// to specify a "hook" at nodes that give a partial match.
+ /// When the search encounters a node with data that partially matches
+ /// \c name (i.e. node's name is a superdomain of \c name) and has
+ /// enabled callback (via the \c RBNode::enableCallback() method), if
+ /// \c callback is non \c NULL then the callback function is called
+ /// with the argument of a reference to the node and the given
+ /// callback argument (\c callback_arg). The template parameter specifies
+ /// the type of the callback argument.
+ /// The callback function returns either \c true or \c false, meaning
+ /// the search should stop or continue, respectively.
+ /// If the return value is \c true the search stops immediately at the
+ /// node even if there could be a longer matching name below it.
+ /// In reality, this convoluted callback rule is specifically intended
+ /// to be used to handle a zone cut (delegation) at a name search inside
+ /// a zone, and won't be used in any other cases.
+ /// Other applications of the tree won't need callbacks, and they should
+ /// use the non templated version of the \c find() method.
+ ///
+ /// Since the expected usage of callback is very limited, we do not
+ /// generalize the interface so that it can be an arbitrary functions or
+ /// functor objects in favor of simplicity and efficiency.
+ ///
+ /// This method involves operations on names that can throw an exception.
+ /// If that happens the exception will be propagated to the caller.
+ /// The callback function should generally not throw an exception, but
+ /// if it throws, the exception will be propagated to the caller.
+ ///
/// \param name Target to be found
- /// \param node Point to the node when the return vaule is \c not
- /// NOTFOUND, if the return value is NOTFOUND, the value of node is
- /// \c unknown
- Result find(const isc::dns::Name& name, RBNode<T>** node) const;
- Result find(const isc::dns::Name& name, const RBNode<T>** node) const;
+ /// \param node On success (either \c EXACTMATCH or \c PARTIALMATCH)
+ /// it will store a pointer to the matching node
+ /// \param callback If non \c NULL, a call back function to be called
+ /// at "delegation" nodes (see above).
+ /// \param callback_arg A caller supplied argument to be passed to
+ /// \c callback.
+ ///
+ /// \return \c EXACTMATCH A node that whose name is equal to \c name is
+ /// found. \c *node will be set to point to that node.
+ /// \return \c PARTIALMATCH There is a no exact match, but a superdomain
+ /// of \c name exists. \c node will be set to point to the node whose
+ /// name is the longest among such superdomains.
+ /// \return \c NOTFOUND There is no exact or partial match against \c name
+ /// \c *node will be intact in this case.
+ template <typename CBARG>
+ Result find(const isc::dns::Name& name, RBNode<T>** node,
+ bool (*callback)(const RBNode<T>&, CBARG),
+ CBARG callback_arg) const;
+
+ /// Same as the other version, but the returned \c node will be immutable.
+ template <typename CBARG>
+ Result find(const isc::dns::Name& name, const RBNode<T>** node,
+ bool (*callback)(const RBNode<T>&, CBARG),
+ CBARG callback_arg) const;
+
+ /// Same as the templated version, but does not use callback.
+ ///
+ /// Applications except the zone implementation should generally use the
+ /// non templated version.
+ Result find(const isc::dns::Name& name, RBNode<T>** node) const {
+ return (find<void*>(name, node, NULL, NULL));
+ }
+
+ /// Same as the templated version, but does not use callback, and the
+ /// returned \c node will be immutable.
+ ///
+ /// In general, this version should be preferred over the other non
+ /// templated version, unless the caller knows it should modify the
+ /// returned node.
+ Result find(const isc::dns::Name& name, const RBNode<T>** node) const {
+ return (find<void*>(name, node, NULL, NULL));
+ }
/// \brief Get the total node count in the tree
/// the node count including the node created common suffix node,
@@ -289,10 +407,20 @@
/// - ALREADYEXIST means already has the node with the given name
//
/// \node To modify the data related with one name but not sure the name has
- /// inserted or not, it is better to call \code insert \endcode,instead of
- /// \code find() \endcode, in case the name isn't exist and needs to insert again
+ /// inserted or not, it is better to call \c insert,instead of
+ /// \c find(), in case the name isn't exist and needs to insert again
Result insert(const isc::dns::Name& name, RBNode<T>** inserted_node);
//@}
+
+ /// \brief Swaps two tree's contents.
+ ///
+ /// This acts the same as many std::*.swap functions, exchanges the
+ /// contents. This doesn't throw anything.
+ void swap(RBTree<T>& other) {
+ std::swap(root_, other.root_);
+ std::swap(NULLNODE, other.NULLNODE);
+ std::swap(node_count_, other.node_count_);
+ }
private:
/// \name RBTree balance functions
@@ -315,8 +443,11 @@
/// and node will points to c.b.a
/// \note parameter up now is not used by any funciton, but we are gonna
/// need it soon to implement function like remove
+ template <typename CBARG>
Result findHelper(const isc::dns::Name& name, const RBNode<T>** up,
- RBNode<T>** node) const;
+ RBNode<T>** node,
+ bool (*callback)(const RBNode<T>&, CBARG),
+ CBARG callback_arg) const;
void dumpTreeHelper(std::ostream& os, const RBNode<T>* node,
unsigned int depth) const;
/// for indent purpose, add certian mount empty charachter to output stream
@@ -380,30 +511,39 @@
--node_count_;
}
-template <typename T>
+template <typename T> template <typename CBARG>
typename RBTree<T>::Result
-RBTree<T>::find(const isc::dns::Name& name, RBNode<T>** node) const {
+RBTree<T>::find(const isc::dns::Name& name, RBNode<T>** node,
+ bool (*callback)(const RBNode<T>&, CBARG),
+ CBARG callback_arg) const
+{
const RBNode<T>* up_node = NULLNODE;
- return (findHelper(name, &up_node, node));
-}
-
-template <typename T>
+ return (findHelper(name, &up_node, node, callback, callback_arg));
+}
+
+template <typename T> template <typename CBARG>
typename RBTree<T>::Result
-RBTree<T>::find(const isc::dns::Name& name, const RBNode<T>** node) const {
+RBTree<T>::find(const isc::dns::Name& name, const RBNode<T>** node,
+ bool (*callback)(const RBNode<T>&, CBARG),
+ CBARG callback_arg) const
+{
const RBNode<T>* up_node;
RBNode<T>* target_node;
const typename RBTree<T>::Result ret =
- findHelper(name, &up_node, &target_node);
+ findHelper(name, &up_node, &target_node, callback, callback_arg);
if (ret != NOTFOUND) {
*node = target_node;
}
return (ret);
}
-template <typename T>
+template <typename T> template <typename CBARG>
typename RBTree<T>::Result
-RBTree<T>::findHelper(const isc::dns::Name& target_name, const RBNode<T>** up_node,
- RBNode<T>** target) const
+RBTree<T>::findHelper(const isc::dns::Name& target_name,
+ const RBNode<T>** up_node,
+ RBNode<T>** target,
+ bool (*callback)(const RBNode<T>&, CBARG),
+ CBARG callback_arg) const
{
using namespace helper;
@@ -431,12 +571,17 @@
node = (compare_result.getOrder() < 0) ?
node->left_ : node->right_;
} else if (relation == isc::dns::NameComparisonResult::SUBDOMAIN) {
- *up_node = node;
- name = name - node->name_;
if (!node->isEmpty()) {
ret = RBTree<T>::PARTIALMATCH;
*target = node;
+ if (callback != NULL && node->callback_required_) {
+ if ((callback)(*node, callback_arg)) {
+ break;
+ }
+ }
}
+ *up_node = node;
+ name = name - node->name_;
node = node->down_;
} else {
break;
@@ -531,6 +676,7 @@
// after the RBNode creation
std::auto_ptr<RBNode<T> > down_node(new RBNode<T>(sub_name));
std::swap(node.data_, down_node->data_);
+ std::swap(node.callback_required_, down_node->callback_required_);
down_node->down_ = node.down_;
node.name_ = base_name;
node.down_ = down_node.get();
Modified: branches/trac384/src/lib/datasrc/tests/memory_datasrc_unittest.cc
==============================================================================
--- branches/trac384/src/lib/datasrc/tests/memory_datasrc_unittest.cc (original)
+++ branches/trac384/src/lib/datasrc/tests/memory_datasrc_unittest.cc Mon Jan 3 13:47:41 2011
@@ -16,8 +16,9 @@
#include <dns/name.h>
#include <dns/rrclass.h>
-
-#include <datasrc/zonetable.h>
+#include <dns/rrttl.h>
+#include <dns/masterload.h>
+
#include <datasrc/memory_datasrc.h>
#include <gtest/gtest.h>
@@ -26,11 +27,15 @@
using namespace isc::datasrc;
namespace {
+// Commonly used result codes (Who should write the prefix all the time)
+using result::SUCCESS;
+using result::EXIST;
class MemoryDataSrcTest : public ::testing::Test {
protected:
- MemoryDataSrcTest()
+ MemoryDataSrcTest() : rrclass(RRClass::IN())
{}
+ RRClass rrclass;
MemoryDataSrc memory_datasrc;
};
@@ -112,4 +117,292 @@
EXPECT_EQ(Name("i.g.h"),
memory_datasrc.findZone(Name("z.i.g.h")).zone->getOrigin());
}
-}
+
+TEST_F(MemoryDataSrcTest, getZoneCount) {
+ EXPECT_EQ(0, memory_datasrc.getZoneCount());
+ memory_datasrc.addZone(
+ ZonePtr(new MemoryZone(rrclass, Name("example.com"))));
+ EXPECT_EQ(1, memory_datasrc.getZoneCount());
+
+ // duplicate add. counter shouldn't change
+ memory_datasrc.addZone(
+ ZonePtr(new MemoryZone(rrclass, Name("example.com"))));
+ EXPECT_EQ(1, memory_datasrc.getZoneCount());
+
+ // add one more
+ memory_datasrc.addZone(
+ ZonePtr(new MemoryZone(rrclass, Name("example.org"))));
+ EXPECT_EQ(2, memory_datasrc.getZoneCount());
+}
+
+/// \brief Test fixture for the MemoryZone class
+class MemoryZoneTest : public ::testing::Test {
+public:
+ MemoryZoneTest() :
+ class_(RRClass::IN()),
+ origin_("example.org"),
+ ns_name_("ns.example.org"),
+ child_ns_name_("child.example.org"),
+ child_glue_name_("ns.child.example.org"),
+ grandchild_ns_name_("grand.child.example.org"),
+ grandchild_glue_name_("ns.grand.child.example.org"),
+ zone_(class_, origin_),
+ rr_out_(new RRset(Name("example.com"), class_, RRType::A(),
+ RRTTL(300))),
+ rr_ns_(new RRset(origin_, class_, RRType::NS(), RRTTL(300))),
+ rr_ns_a_(new RRset(ns_name_, class_, RRType::A(), RRTTL(300))),
+ rr_ns_aaaa_(new RRset(ns_name_, class_, RRType::AAAA(), RRTTL(300))),
+ rr_a_(new RRset(origin_, class_, RRType::A(), RRTTL(300))),
+ rr_child_ns_(new RRset(child_ns_name_, class_, RRType::NS(),
+ RRTTL(300))),
+ rr_child_glue_(new RRset(child_glue_name_, class_, RRType::A(),
+ RRTTL(300))),
+ rr_grandchild_ns_(new RRset(grandchild_ns_name_, class_, RRType::NS(),
+ RRTTL(300))),
+ rr_grandchild_glue_(new RRset(grandchild_glue_name_, class_,
+ RRType::AAAA(), RRTTL(300)))
+ {
+ }
+ // Some data to test with
+ const RRClass class_;
+ const Name origin_, ns_name_, child_ns_name_, child_glue_name_,
+ grandchild_ns_name_, grandchild_glue_name_;
+ // The zone to torture by tests
+ MemoryZone zone_;
+
+ /*
+ * Some RRsets to put inside the zone.
+ * They are empty, but the MemoryZone does not have a reason to look
+ * inside anyway. We will check it finds them and does not change
+ * the pointer.
+ */
+ ConstRRsetPtr
+ // Out of zone RRset
+ rr_out_,
+ // NS of example.org
+ rr_ns_,
+ // A of ns.example.org
+ rr_ns_a_,
+ // AAAA of ns.example.org
+ rr_ns_aaaa_,
+ // A of example.org
+ rr_a_;
+ ConstRRsetPtr rr_child_ns_; // NS of a child domain (for delegation)
+ ConstRRsetPtr rr_child_glue_; // glue RR of the child domain
+ ConstRRsetPtr rr_grandchild_ns_; // NS below a zone cut (unusual)
+ ConstRRsetPtr rr_grandchild_glue_; // glue RR below a deeper zone cut
+
+ /**
+ * \brief Test one find query to the zone.
+ *
+ * Asks a query to the zone and checks it does not throw and returns
+ * expected results. It returns nothing, it just signals failures
+ * to GTEST.
+ *
+ * \param name The name to ask for.
+ * \param rrtype The RRType to ask of.
+ * \param result The expected code of the result.
+ * \param check_answer Should a check against equality of the answer be
+ * done?
+ * \param answer The expected rrset, if any should be returned.
+ * \param zone Check different MemoryZone object than zone_ (if NULL,
+ * uses zone_)
+ */
+ void findTest(const Name& name, const RRType& rrtype, Zone::Result result,
+ bool check_answer = true,
+ const ConstRRsetPtr& answer = ConstRRsetPtr(),
+ MemoryZone *zone = NULL,
+ Zone::FindOptions options = Zone::FIND_DEFAULT)
+ {
+ if (!zone) {
+ zone = &zone_;
+ }
+ // The whole block is inside, because we need to check the result and
+ // we can't assign to FindResult
+ EXPECT_NO_THROW({
+ Zone::FindResult find_result(zone->find(name, rrtype,
+ options));
+ // Check it returns correct answers
+ EXPECT_EQ(result, find_result.code);
+ if (check_answer) {
+ EXPECT_EQ(answer, find_result.rrset);
+ }
+ });
+ }
+};
+
+/**
+ * \brief Test MemoryZone::MemoryZone constructor.
+ *
+ * Takes the created zone and checks its properties they are the same
+ * as passed parameters.
+ */
+TEST_F(MemoryZoneTest, constructor) {
+ ASSERT_EQ(class_, zone_.getClass());
+ ASSERT_EQ(origin_, zone_.getOrigin());
+}
+/**
+ * \brief Test adding.
+ *
+ * We test that it throws at the correct moments and the correct exceptions.
+ * And we test the return value.
+ */
+TEST_F(MemoryZoneTest, add) {
+ // This one does not belong to this zone
+ EXPECT_THROW(zone_.add(rr_out_), MemoryZone::OutOfZone);
+ // Test null pointer
+ EXPECT_THROW(zone_.add(ConstRRsetPtr()), MemoryZone::NullRRset);
+
+ // Now put all the data we have there. It should throw nothing
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_a_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_aaaa_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_a_)));
+
+ // Try putting there something twice, it should be rejected
+ EXPECT_NO_THROW(EXPECT_EQ(EXIST, zone_.add(rr_ns_)));
+ EXPECT_NO_THROW(EXPECT_EQ(EXIST, zone_.add(rr_ns_a_)));
+}
+
+// Test adding child zones and zone cut handling
+TEST_F(MemoryZoneTest, delegationNS) {
+ // add in-zone data
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_)));
+
+ // install a zone cut
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_child_ns_)));
+
+ // below the zone cut
+ findTest(Name("www.child.example.org"), RRType::A(), Zone::DELEGATION,
+ true, rr_child_ns_);
+
+ // at the zone cut
+ findTest(Name("child.example.org"), RRType::A(), Zone::DELEGATION,
+ true, rr_child_ns_);
+ findTest(Name("child.example.org"), RRType::NS(), Zone::DELEGATION,
+ true, rr_child_ns_);
+
+ // finding NS for the apex (origin) node. This must not be confused
+ // with delegation due to the existence of an NS RR.
+ findTest(origin_, RRType::NS(), Zone::SUCCESS, true, rr_ns_);
+
+ // unusual case of "nested delegation": the highest cut should be used.
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_grandchild_ns_)));
+ findTest(Name("www.grand.child.example.org"), RRType::A(),
+ Zone::DELEGATION, true, rr_child_ns_); // note: !rr_grandchild_ns_
+}
+
+TEST_F(MemoryZoneTest, glue) {
+ // install zone data:
+ // a zone cut
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_child_ns_)));
+ // glue for this cut
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_child_glue_)));
+ // a nested zone cut (unusual)
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_grandchild_ns_)));
+ // glue under the deeper zone cut
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_grandchild_glue_)));
+
+ // by default glue is hidden due to the zone cut
+ findTest(child_glue_name_, RRType::A(), Zone::DELEGATION, true,
+ rr_child_ns_);
+
+
+ // If we do it in the "glue OK" mode, we should find the exact match.
+ findTest(child_glue_name_, RRType::A(), Zone::SUCCESS, true,
+ rr_child_glue_, NULL, Zone::FIND_GLUE_OK);
+
+ // glue OK + NXRRSET case
+ findTest(child_glue_name_, RRType::AAAA(), Zone::NXRRSET, true,
+ ConstRRsetPtr(), NULL, Zone::FIND_GLUE_OK);
+
+ // glue OK + NXDOMAIN case
+ findTest(Name("www.child.example.org"), RRType::A(), Zone::DELEGATION,
+ true, rr_child_ns_, NULL, Zone::FIND_GLUE_OK);
+
+ // TODO:
+ // glue name would match a wildcard under a zone cut: wildcard match
+ // shouldn't happen under a cut and result must be PARTIALMATCH
+ // (This case cannot be tested yet)
+
+ // nested cut case. The glue should be found.
+ findTest(grandchild_glue_name_, RRType::AAAA(), Zone::SUCCESS,
+ true, rr_grandchild_glue_, NULL, Zone::FIND_GLUE_OK);
+
+ // A non-existent name in nested cut. This should result in delegation
+ // at the highest zone cut.
+ findTest(Name("www.grand.child.example.org"), RRType::TXT(),
+ Zone::DELEGATION, true, rr_child_ns_, NULL, Zone::FIND_GLUE_OK);
+}
+
+// Test adding DNAMEs and resulting delegation handling
+// Listing ideas only for now
+TEST_F(MemoryZoneTest, delegationDNAME) {
+ // apex DNAME: allowed by spec. No DNAME delegation at the apex;
+ // descendants are subject to delegation.
+
+ // Other cases of NS and DNAME mixture are prohibited.
+ // BIND 9 doesn't reject such cases at load time, however.
+
+ // DNAME and ordinary types (allowed by spec)
+}
+
+/**
+ * \brief Test searching.
+ *
+ * Check it finds or does not find correctly and does not throw exceptions.
+ * \todo This doesn't do any kind of CNAME and so on. If it isn't
+ * directly there, it just tells it doesn't exist.
+ */
+TEST_F(MemoryZoneTest, find) {
+ // Fill some data inside
+ // Now put all the data we have there. It should throw nothing
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_a_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_ns_aaaa_)));
+ EXPECT_NO_THROW(EXPECT_EQ(SUCCESS, zone_.add(rr_a_)));
+
+ // These two should be successful
+ findTest(origin_, RRType::NS(), Zone::SUCCESS, true, rr_ns_);
+ findTest(ns_name_, RRType::A(), Zone::SUCCESS, true, rr_ns_a_);
+
+ // These domain exist but don't have the provided RRType
+ findTest(origin_, RRType::AAAA(), Zone::NXRRSET);
+ findTest(ns_name_, RRType::NS(), Zone::NXRRSET);
+
+ // These domains don't exist (and one is out of the zone)
+ findTest(Name("nothere.example.org"), RRType::A(), Zone::NXDOMAIN);
+ findTest(Name("example.net"), RRType::A(), Zone::NXDOMAIN);
+}
+
+TEST_F(MemoryZoneTest, load) {
+ // Put some data inside the zone
+ EXPECT_NO_THROW(EXPECT_EQ(result::SUCCESS, zone_.add(rr_ns_)));
+ // Loading with different origin should fail
+ EXPECT_THROW(zone_.load(TEST_DATA_DIR "/root.zone"), MasterLoadError);
+ // See the original data is still there, survived the exception
+ findTest(origin_, RRType::NS(), Zone::SUCCESS, true, rr_ns_);
+ // Create correct zone
+ MemoryZone rootzone(class_, Name("."));
+ // Try putting something inside
+ EXPECT_NO_THROW(EXPECT_EQ(result::SUCCESS, rootzone.add(rr_ns_aaaa_)));
+ // Load the zone. It should overwrite/remove the above RRset
+ EXPECT_NO_THROW(rootzone.load(TEST_DATA_DIR "/root.zone"));
+
+ // Now see there are some rrsets (we don't look inside, though)
+ findTest(Name("."), RRType::SOA(), Zone::SUCCESS, false, ConstRRsetPtr(),
+ &rootzone);
+ findTest(Name("."), RRType::NS(), Zone::SUCCESS, false, ConstRRsetPtr(),
+ &rootzone);
+ findTest(Name("a.root-servers.net."), RRType::A(), Zone::SUCCESS, false,
+ ConstRRsetPtr(), &rootzone);
+ // But this should no longer be here
+ findTest(ns_name_, RRType::AAAA(), Zone::NXDOMAIN, true, ConstRRsetPtr(),
+ &rootzone);
+
+ // Try loading zone that is wrong in a different way
+ EXPECT_THROW(zone_.load(TEST_DATA_DIR "/duplicate_rrset.zone"),
+ MasterLoadError);
+}
+
+}
Modified: branches/trac384/src/lib/datasrc/tests/rbtree_unittest.cc
==============================================================================
--- branches/trac384/src/lib/datasrc/tests/rbtree_unittest.cc (original)
+++ branches/trac384/src/lib/datasrc/tests/rbtree_unittest.cc Mon Jan 3 13:47:41 2011
@@ -169,6 +169,61 @@
EXPECT_EQ(Name("q"), rbtnode->getName());
}
+bool
+testCallback(const RBNode<int>&, bool* callack_checker) {
+ *callack_checker = true;
+ return (false);
+}
+
+TEST_F(RBTreeTest, callback) {
+ // by default callback isn't enabled
+ EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("callback.example"),
+ &rbtnode));
+ rbtnode->setData(RBNode<int>::NodeDataPtr(new int(1)));
+ EXPECT_FALSE(rbtnode->isCallbackEnabled());
+
+ // enable/re-disable callback
+ rbtnode->enableCallback();
+ EXPECT_TRUE(rbtnode->isCallbackEnabled());
+ rbtnode->disableCallback();
+ EXPECT_FALSE(rbtnode->isCallbackEnabled());
+
+ // enable again for subsequent tests
+ rbtnode->enableCallback();
+ // add more levels below and above the callback node for partial match.
+ RBNode<int>* subrbtnode;
+ EXPECT_EQ(RBTree<int>::SUCCEED, rbtree.insert(Name("sub.callback.example"),
+ &subrbtnode));
+ subrbtnode->setData(RBNode<int>::NodeDataPtr(new int(2)));
+ RBNode<int>* parentrbtnode;
+ EXPECT_EQ(RBTree<int>::ALREADYEXIST, rbtree.insert(Name("example"),
+ &parentrbtnode));
+ // the chilld/parent nodes shouldn't "inherit" the callback flag.
+ // "rbtnode" may be invalid due to the insertion, so we need to re-find
+ // it.
+ EXPECT_EQ(RBTree<int>::EXACTMATCH, rbtree.find(Name("callback.example"),
+ &rbtnode));
+ EXPECT_TRUE(rbtnode->isCallbackEnabled());
+ EXPECT_FALSE(subrbtnode->isCallbackEnabled());
+ EXPECT_FALSE(parentrbtnode->isCallbackEnabled());
+
+ // check if the callback is called from find()
+ bool callback_called = false;
+ EXPECT_EQ(RBTree<int>::EXACTMATCH,
+ rbtree.find(Name("sub.callback.example"), &crbtnode,
+ testCallback, &callback_called));
+ EXPECT_TRUE(callback_called);
+
+ // enable callback at the parent node, but it doesn't have data so
+ // the callback shouldn't be called.
+ parentrbtnode->enableCallback();
+ callback_called = false;
+ EXPECT_EQ(RBTree<int>::EXACTMATCH,
+ rbtree.find(Name("callback.example"), &crbtnode,
+ testCallback, &callback_called));
+ EXPECT_FALSE(callback_called);
+}
+
TEST_F(RBTreeTest, dumpTree) {
std::ostringstream str;
std::ostringstream str2;
@@ -176,4 +231,34 @@
str2 << "tree has 13 node(s)\nb. (black)\n a. (black)\n NULL\n NULL\n d.e.f. (black)[invisible] \n begin down from d.e.f.\n w.y. (black)[invisible] \n begin down from w.y.\n p. (black)\n o. (red)\n NULL\n NULL\n q. (red)\n NULL\n NULL\n end down from w.y.\n x. (red)\n NULL\n NULL\n z. (red)\n begin down from z.\n j. (black)\n NULL\n NULL\n end down from z.\n NULL\n NULL\n end down from d.e.f.\n c. (red)\n NULL\n NULL\n g.h. (red)\n begin down from g.h.\n i. (black)\n
NULL\n NULL\n end down from g.h.\n NULL\n NULL\n";
EXPECT_EQ(str.str(), str2.str());
}
-}
+
+TEST_F(RBTreeTest, swap) {
+ // Store info about the first tree
+ std::ostringstream str1;
+ rbtree.dumpTree(str1);
+ size_t count1(rbtree.getNodeCount());
+
+ // Create second one and store state
+ RBTree<int> tree2;
+ RBNode<int>* node;
+ tree2.insert(Name("second"), &node);
+ std::ostringstream str2;
+ tree2.dumpTree(str2);
+
+ // Swap them
+ ASSERT_NO_THROW(tree2.swap(rbtree));
+
+ // Check their sizes
+ ASSERT_EQ(1, rbtree.getNodeCount());
+ ASSERT_EQ(count1, tree2.getNodeCount());
+
+ // And content
+ std::ostringstream out;
+ rbtree.dumpTree(out);
+ ASSERT_EQ(str2.str(), out.str());
+ out.str("");
+ tree2.dumpTree(out);
+ ASSERT_EQ(str1.str(), out.str());
+}
+
+}
Modified: branches/trac384/src/lib/datasrc/tests/zonetable_unittest.cc
==============================================================================
--- branches/trac384/src/lib/datasrc/tests/zonetable_unittest.cc (original)
+++ branches/trac384/src/lib/datasrc/tests/zonetable_unittest.cc Mon Jan 3 13:47:41 2011
@@ -18,6 +18,8 @@
#include <dns/rrclass.h>
#include <datasrc/zonetable.h>
+// We use MemoryZone to put something into the table
+#include <datasrc/memory_datasrc.h>
#include <gtest/gtest.h>
@@ -73,7 +75,7 @@
EXPECT_THROW(zone_table.addZone(ZonePtr()), isc::InvalidParameter);
}
-TEST_F(ZoneTableTest, removeZone) {
+TEST_F(ZoneTableTest, DISABLED_removeZone) {
EXPECT_EQ(result::SUCCESS, zone_table.addZone(zone1));
EXPECT_EQ(result::SUCCESS, zone_table.addZone(zone2));
EXPECT_EQ(result::SUCCESS, zone_table.addZone(zone3));
Modified: branches/trac384/src/lib/datasrc/zonetable.cc
==============================================================================
--- branches/trac384/src/lib/datasrc/zonetable.cc (original)
+++ branches/trac384/src/lib/datasrc/zonetable.cc Mon Jan 3 13:47:41 2011
@@ -12,15 +12,12 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-// Note: map and utility (for 'pair') are for temporary workaround.
-// we'll soon replace them with built-in intelligent backend structure.
-#include <map>
-#include <utility>
+#include <cassert>
#include <dns/name.h>
-#include <dns/rrclass.h>
#include <datasrc/zonetable.h>
+#include <datasrc/rbtree.h>
using namespace std;
using namespace isc::dns;
@@ -28,46 +25,79 @@
namespace isc {
namespace datasrc {
-struct MemoryZone::MemoryZoneImpl {
- MemoryZoneImpl(const RRClass& zone_class, const Name& origin) :
- zone_class_(zone_class), origin_(origin)
- {}
- RRClass zone_class_;
- Name origin_;
-};
+/// \short Private data and implementation of ZoneTable
+struct ZoneTable::ZoneTableImpl {
+ // Type aliases to make it shorter
+ typedef RBTree<Zone> ZoneTree;
+ typedef RBNode<Zone> ZoneNode;
+ // The actual storage
+ ZoneTree zones_;
-MemoryZone::MemoryZone(const RRClass& zone_class, const Name& origin) :
- impl_(new MemoryZoneImpl(zone_class, origin))
-{
-}
+ /*
+ * The implementation methods are here and just wrap-called in the
+ * ZoneTable. We have variables locally (without impl_->), have
+ * type aliases, etc. And they will get inlined anyway.
+ */
-MemoryZone::~MemoryZone() {
- delete impl_;
-}
+ // Implementation of ZoneTable::addZone
+ result::Result addZone(ZonePtr zone) {
+ // Sanity check
+ if (!zone) {
+ isc_throw(InvalidParameter,
+ "Null pointer is passed to ZoneTable::addZone()");
+ }
-const Name&
-MemoryZone::getOrigin() const {
- return (impl_->origin_);
-}
+ // Get the node where we put the zone
+ ZoneNode* node(NULL);
+ switch (zones_.insert(zone->getOrigin(), &node)) {
+ // This is OK
+ case ZoneTree::SUCCEED:
+ case ZoneTree::ALREADYEXIST:
+ break;
+ // Can Not Happen
+ default:
+ assert(0);
+ }
+ // Can Not Happen
+ assert(node);
-const RRClass&
-MemoryZone::getClass() const {
- return (impl_->zone_class_);
-}
+ // Is it empty? We either just created it or it might be nonterminal
+ if (node->isEmpty()) {
+ node->setData(zone);
+ return (result::SUCCESS);
+ } else { // There's something there already
+ return (result::EXIST);
+ }
+ }
-Zone::FindResult
-MemoryZone::find(const Name&, const RRType&) const {
- // This is a tentative implementation that always returns NXDOMAIN.
- return (FindResult(NXDOMAIN, RRsetPtr()));
-}
+ // Implementation of ZoneTable::findZone
+ ZoneTable::FindResult findZone(const Name& name) const {
+ ZoneNode *node(NULL);
+ result::Result my_result;
-// This is a temporary, inefficient implementation using std::map and handmade
-// iteration to realize longest match.
+ // Translate the return codes
+ switch (zones_.find(name, &node)) {
+ case ZoneTree::EXACTMATCH:
+ my_result = result::SUCCESS;
+ break;
+ case ZoneTree::PARTIALMATCH:
+ my_result = result::PARTIALMATCH;
+ break;
+ // We have no data there, so translate the pointer to NULL as well
+ case ZoneTree::NOTFOUND:
+ return (FindResult(result::NOTFOUND, ConstZonePtr()));
+ // Can Not Happen
+ default:
+ assert(0);
+ // Because of warning
+ return (FindResult(result::NOTFOUND, ConstZonePtr()));
+ }
-struct ZoneTable::ZoneTableImpl {
- typedef map<Name, ZonePtr> ZoneMap;
- typedef pair<Name, ZonePtr> NameAndZone;
- ZoneMap zones;
+ // Can Not Happen (remember, NOTFOUND is handled)
+ assert(node);
+
+ return (FindResult(my_result, node->getData()));
+ }
};
ZoneTable::ZoneTable() : impl_(new ZoneTableImpl)
@@ -79,40 +109,21 @@
result::Result
ZoneTable::addZone(ZonePtr zone) {
- if (!zone) {
- isc_throw(InvalidParameter,
- "Null pointer is passed to ZoneTable::addZone()");
- }
-
- if (impl_->zones.insert(
- ZoneTableImpl::NameAndZone(zone->getOrigin(), zone)).second
- == true) {
- return (result::SUCCESS);
- } else {
- return (result::EXIST);
- }
+ return (impl_->addZone(zone));
}
result::Result
-ZoneTable::removeZone(const Name& origin) {
- return (impl_->zones.erase(origin) == 1 ? result::SUCCESS :
- result::NOTFOUND);
+ZoneTable::removeZone(const Name&) {
+ // TODO Implement
+ assert(0);
+ // This should not ever be returned, the assert should kill us by now
+ return (result::SUCCESS);
}
ZoneTable::FindResult
ZoneTable::findZone(const Name& name) const {
- // Inefficient internal loop to find a longest match.
- // This will be replaced with a single call to more intelligent backend.
- for (int i = 0; i < name.getLabelCount(); ++i) {
- Name matchname(name.split(i));
- ZoneTableImpl::ZoneMap::const_iterator found =
- impl_->zones.find(matchname);
- if (found != impl_->zones.end()) {
- return (FindResult(i == 0 ? result::SUCCESS :
- result::PARTIALMATCH, (*found).second));
- }
- }
- return (FindResult(result::NOTFOUND, ConstZonePtr()));
+ return (impl_->findZone(name));
}
+
} // end of namespace datasrc
} // end of namespace isc
Modified: branches/trac384/src/lib/datasrc/zonetable.h
==============================================================================
--- branches/trac384/src/lib/datasrc/zonetable.h (original)
+++ branches/trac384/src/lib/datasrc/zonetable.h Mon Jan 3 13:47:41 2011
@@ -19,222 +19,15 @@
#include <dns/rrset.h>
+#include <datasrc/zone.h>
+
namespace isc {
namespace dns {
class Name;
class RRClass;
-};
+}
namespace datasrc {
-namespace result {
-/// Result codes of various public methods of in memory data source
-///
-/// The detailed semantics may differ in different methods.
-/// See the description of specific methods for more details.
-///
-/// Note: this is intended to be used from other data sources eventually,
-/// but for now it's specific to in memory data source and its backend.
-enum Result {
- SUCCESS, ///< The operation is successful.
- EXIST, ///< The search key is already stored.
- NOTFOUND, ///< The specified object is not found.
- PARTIALMATCH ///< \c Only a partial match is found.
-};
-}
-
-/// \brief The base class for a single authoritative zone
-///
-/// The \c Zone class is an abstract base class for representing
-/// a DNS zone as part of data source.
-///
-/// At the moment this is provided mainly for making the \c ZoneTable class
-/// and the authoritative query logic testable, and only provides a minimal
-/// set of features.
-/// This is why this class is defined in the same header file, but it may
-/// have to move to a separate header file when we understand what is
-/// necessary for this class for actual operation.
-///
-/// The idea is to provide a specific derived zone class for each data
-/// source, beginning with in memory one. At that point the derived classes
-/// will have more specific features. For example, they will maintain
-/// information about the location of a zone file, whether it's loaded in
-/// memory, etc.
-///
-/// It's not yet clear how the derived zone classes work with various other
-/// data sources when we integrate these components, but one possibility is
-/// something like this:
-/// - If the underlying database such as some variant of SQL doesn't have an
-/// explicit representation of zones (as part of public interface), we can
-/// probably use a "default" zone class that simply encapsulates the
-/// corresponding data source and calls a common "find" like method.
-/// - Some data source may want to specialize it by inheritance as an
-/// optimization. For example, in the current schema design of the sqlite3
-/// data source, its (derived) zone class would contain the information of
-/// the "zone ID".
-///
-/// <b>Note:</b> Unlike some other abstract base classes we don't name the
-/// class beginning with "Abstract". This is because we want to have
-/// commonly used definitions such as \c Result and \c ZonePtr, and we want
-/// to make them look more intuitive.
-class Zone {
-public:
- /// Result codes of the \c find() method.
- ///
- /// Note: the codes are tentative. We may need more, or we may find
- /// some of them unnecessary as we implement more details.
- enum Result {
- SUCCESS, ///< An exact match is found.
- DELEGATION, ///< The search encounters a zone cut.
- NXDOMAIN, ///< There is no domain name that matches the search name
- NXRRSET, ///< There is a matching name but no RRset of the search type
- CNAME, ///< The search encounters and returns a CNAME RR
- DNAME ///< The search encounters and returns a DNAME RR
- };
-
- /// A helper structure to represent the search result of \c find().
- ///
- /// This is a straightforward tuple of the result code and a pointer
- /// to the found RRset to represent the result of \c find()
- /// (there will be more members in the future - see the class
- /// description).
- /// We use this in order to avoid overloading the return value for both
- /// the result code ("success" or "not found") and the found object,
- /// i.e., avoid using \c NULL to mean "not found", etc.
- ///
- /// This is a simple value class whose internal state never changes,
- /// so for convenience we allow the applications to refer to the members
- /// directly.
- ///
- /// Note: we should eventually include a notion of "zone node", which
- /// corresponds to a particular domain name of the zone, so that we can
- /// find RRsets of a different RR type for that name (e.g. for type ANY
- /// query or to include DS RRs with delegation).
- ///
- /// Note: we may also want to include the closest enclosure "node" to
- /// optimize including the NSEC for no-wildcard proof (FWIW NSD does that).
- struct FindResult {
- FindResult(Result param_code,
- const isc::dns::ConstRRsetPtr param_rrset) :
- code(param_code), rrset(param_rrset)
- {}
- const Result code;
- const isc::dns::ConstRRsetPtr rrset;
- };
-
- ///
- /// \name Constructors and Destructor.
- ///
- //@{
-protected:
- /// The default constructor.
- ///
- /// This is intentionally defined as \c protected as this base class should
- /// never be instantiated (except as part of a derived class).
- Zone() {}
-public:
- /// The destructor.
- virtual ~Zone() {}
- //@}
-
- ///
- /// \name Getter Methods
- ///
- /// These methods should never throw an exception.
- //@{
- /// Return the origin name of the zone.
- virtual const isc::dns::Name& getOrigin() const = 0;
-
- /// Return the RR class of the zone.
- virtual const isc::dns::RRClass& getClass() const = 0;
- //@}
-
- ///
- /// \name Search Method
- ///
- //@{
- /// Search the zone for a given pair of domain name and RR type.
- ///
- /// Each derived version of this method searches the underlying backend
- /// for the data that best matches the given name and type.
- /// This method is expected to be "intelligent", and identifies the
- /// best possible answer for the search key. Specifically,
- /// - If the search name belongs under a zone cut, it returns the code
- /// of \c DELEGATION and the NS RRset at the zone cut.
- /// - If there is no matching name, it returns the code of \c NXDOMAIN,
- /// and, if DNSSEC is requested, the NSEC RRset that proves the
- /// non-existence.
- /// - If there is a matching name but no RRset of the search type, it
- /// returns the code of \c NXRRSET, and, if DNSSEC is required,
- /// the NSEC RRset for that name.
- /// - If there is a matching name with CNAME, it returns the code of
- /// \c CNAME and that CNAME RR.
- /// - If the search name matches a delegation point of DNAME, it returns
- /// the code of \c DNAME and that DNAME RR.
- ///
- /// A derived version of this method may involve internal resource
- /// allocation, especially for constructing the resulting RRset, and may
- /// throw an exception if it fails.
- /// It should not throw other types of exceptions.
- ///
- /// Note: It's quite likely that we'll need to specify search options.
- /// For example, we should be able to specify whether to allow returning
- /// glue records at or under a zone cut. We leave this interface open
- /// at this moment.
- ///
- /// \param name The domain name to be searched for.
- /// \param type The RR type to be searched for.
- /// \return A \c FindResult object enclosing the search result (see above).
- virtual FindResult find(const isc::dns::Name& name,
- const isc::dns::RRType& type) const = 0;
- //@}
-};
-
-/// \brief A pointer-like type pointing to a \c Zone object.
-typedef boost::shared_ptr<Zone> ZonePtr;
-
-/// \brief A pointer-like type pointing to a \c Zone object.
-typedef boost::shared_ptr<const Zone> ConstZonePtr;
-
-/// A derived zone class intended to be used with the memory data source.
-///
-/// Currently this is almost empty and is only used for testing the
-/// \c ZoneTable class. It will be substantially expanded, and will probably
-/// moved to a separate header file.
-class MemoryZone : public Zone {
- ///
- /// \name Constructors and Destructor.
- ///
- /// \b Note:
- /// The copy constructor and the assignment operator are intentionally
- /// defined as private, making this class non copyable.
- //@{
-private:
- MemoryZone(const MemoryZone& source);
- MemoryZone& operator=(const MemoryZone& source);
-public:
- /// \brief Constructor from zone parameters.
- ///
- /// This constructor internally involves resource allocation, and if
- /// it fails, a corresponding standard exception will be thrown.
- /// It never throws an exception otherwise.
- ///
- /// \param rrclass The RR class of the zone.
- /// \param origin The origin name of the zone.
- MemoryZone(const isc::dns::RRClass& rrclass, const isc::dns::Name& origin);
-
- /// The destructor.
- virtual ~MemoryZone();
- //@}
-
- virtual const isc::dns::Name& getOrigin() const;
- virtual const isc::dns::RRClass& getClass() const;
- virtual FindResult find(const isc::dns::Name& name,
- const isc::dns::RRType& type) const;
-
-private:
- struct MemoryZoneImpl;
- MemoryZoneImpl* impl_;
-};
/// \brief A set of authoritative zones.
///
@@ -278,8 +71,18 @@
//@}
/// Add a \c Zone to the \c ZoneTable.
- /// See the description of <code>MemoryDataSrc::addZone()</code> for more
- /// details.
+ ///
+ /// \c Zone must not be associated with a NULL pointer; otherwise
+ /// an exception of class \c InvalidParameter will be thrown.
+ /// If internal resource allocation fails, a corresponding standard
+ /// exception will be thrown.
+ /// This method never throws an exception otherwise.
+ ///
+ /// \param zone A \c Zone object to be added.
+ /// \return \c result::SUCCESS If the zone is successfully
+ /// added to the zone table.
+ /// \return \c result::EXIST The zone table already contains
+ /// zone of the same origin.
result::Result addZone(ZonePtr zone);
/// Remove a \c Zone of the given origin name from the \c ZoneTable.
@@ -294,8 +97,23 @@
result::Result removeZone(const isc::dns::Name& origin);
/// Find a \c Zone that best matches the given name in the \c ZoneTable.
- /// See the description of <code>MemoryDataSrc::findZone()</code> for more
- /// details.
+ ///
+ /// It searches the internal storage for a \c Zone that gives the
+ /// longest match against \c name, and returns the result in the
+ /// form of a \c FindResult object as follows:
+ /// - \c code: The result code of the operation.
+ /// - \c result::SUCCESS: A zone that gives an exact match
+ /// is found
+ /// - \c result::PARTIALMATCH: A zone whose origin is a
+ /// super domain of \c name is found (but there is no exact match)
+ /// - \c result::NOTFOUND: For all other cases.
+ /// - \c zone: A <Boost> shared pointer to the found \c Zone object if one
+ /// is found; otherwise \c NULL.
+ ///
+ /// This method never throws an exception.
+ ///
+ /// \param name A domain name for which the search is performed.
+ /// \return A \c FindResult object enclosing the search result (see above).
FindResult findZone(const isc::dns::Name& name) const;
private:
Modified: branches/trac384/src/lib/dns/python/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/dns/python/tests/Makefile.am (original)
+++ branches/trac384/src/lib/dns/python/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,3 +1,4 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = edns_python_test.py
PYTESTS += message_python_test.py
PYTESTS += messagerenderer_python_test.py
@@ -22,14 +23,17 @@
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
endif
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/dns/.libs:$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
TESTDATA_PATH=$(abs_top_srcdir)/src/lib/dns/tests/testdata:$(abs_top_builddir)/src/lib/dns/tests/testdata \
$(LIBRARY_PATH_PLACEHOLDER) \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/cc/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/cc/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/cc/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,16 +1,21 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
+
PYTESTS = message_test.py data_test.py session_test.py
# NOTE: test_session.py is to be run manually, so not automated.
EXTRA_DIST = $(PYTESTS)
EXTRA_DIST += sendcmd.py
EXTRA_DIST += test_session.py
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
BIND10_TEST_SOCKET_FILE=$(builddir)/test_socket.sock \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/config/ccsession.py
==============================================================================
--- branches/trac384/src/lib/python/isc/config/ccsession.py (original)
+++ branches/trac384/src/lib/python/isc/config/ccsession.py Mon Jan 3 13:47:41 2011
@@ -224,7 +224,7 @@
if not self._config_handler:
answer = create_answer(2, self._module_name + " has no config handler")
elif not self.get_module_spec().validate_config(False, new_config, errors):
- answer = create_answer(1, " ".join(errors))
+ answer = create_answer(1, ", ".join(errors))
else:
isc.cc.data.remove_identical(new_config, self.get_local_config())
answer = self._config_handler(new_config)
@@ -422,7 +422,16 @@
"""Commit all local changes, send them through b10-cmdctl to
the configuration manager"""
if self.get_local_changes():
- self._conn.send_POST('/ConfigManager/set_config', [ self.get_local_changes() ])
- # todo: check result
- self.request_current_config()
- self.clear_local_changes()
+ response = self._conn.send_POST('/ConfigManager/set_config',
+ [ self.get_local_changes() ])
+ answer = isc.cc.data.parse_value_str(response.read().decode())
+ # answer is either an empty dict (on success), or one
+ # containing errors
+ if answer == {}:
+ self.request_current_config()
+ self.clear_local_changes()
+ elif "error" in answer:
+ print("Error: " + answer["error"])
+ print("Configuration not committed")
+ else:
+ raise ModuleCCSessionError("Unknown format of answer in commit(): " + str(answer))
Modified: branches/trac384/src/lib/python/isc/config/config_data.py
==============================================================================
--- branches/trac384/src/lib/python/isc/config/config_data.py (original)
+++ branches/trac384/src/lib/python/isc/config/config_data.py Mon Jan 3 13:47:41 2011
@@ -506,12 +506,15 @@
there is a specification for the given identifier, the type
is checked."""
spec_part = self.find_spec_part(identifier)
- if spec_part is not None and value is not None:
- id, list_indices = isc.cc.data.split_identifier_list_indices(identifier)
- if list_indices is not None \
- and spec_part['item_type'] == 'list':
- spec_part = spec_part['list_item_spec']
- check_type(spec_part, value)
+ if spec_part is not None:
+ if value is not None:
+ id, list_indices = isc.cc.data.split_identifier_list_indices(identifier)
+ if list_indices is not None \
+ and spec_part['item_type'] == 'list':
+ spec_part = spec_part['list_item_spec']
+ check_type(spec_part, value)
+ else:
+ raise isc.cc.data.DataNotFoundError(identifier)
# Since we do not support list diffs (yet?), we need to
# copy the currently set list of items to _local_changes
Modified: branches/trac384/src/lib/python/isc/config/module_spec.py
==============================================================================
--- branches/trac384/src/lib/python/isc/config/module_spec.py (original)
+++ branches/trac384/src/lib/python/isc/config/module_spec.py Mon Jan 3 13:47:41 2011
@@ -328,7 +328,25 @@
return True
def _validate_spec_list(module_spec, full, data, errors):
+ # we do not return immediately, there may be more errors
+ # so we keep a boolean to keep track if we found errors
+ validated = True
+
+ # check if the known items are correct
for spec_item in module_spec:
if not _validate_spec(spec_item, full, data, errors):
- return False
- return True
+ validated = False
+
+ # check if there are items in our data that are not in the
+ # specification
+ if data is not None:
+ for item_name in data:
+ found = False
+ for spec_item in module_spec:
+ if spec_item["item_name"] == item_name:
+ found = True
+ if not found:
+ if errors != None:
+ errors.append("unknown item " + item_name)
+ validated = False
+ return validated
Modified: branches/trac384/src/lib/python/isc/config/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/config/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/config/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,16 +1,20 @@
+PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = ccsession_test.py cfgmgr_test.py config_data_test.py
PYTESTS += module_spec_test.py
EXTRA_DIST = $(PYTESTS)
EXTRA_DIST += unittest_fakesession.py
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python \
CONFIG_TESTDATA_PATH=$(abs_top_srcdir)/src/lib/config/tests/testdata \
CONFIG_WR_TESTDATA_PATH=$(abs_top_builddir)/src/lib/config/tests/testdata \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/config/tests/ccsession_test.py
==============================================================================
--- branches/trac384/src/lib/python/isc/config/tests/ccsession_test.py (original)
+++ branches/trac384/src/lib/python/isc/config/tests/ccsession_test.py Mon Jan 3 13:47:41 2011
@@ -290,7 +290,7 @@
mccs = self.create_session("spec2.spec", None, None, fake_session)
mccs.set_config_handler(self.my_config_handler_ok)
self.assertEqual(len(fake_session.message_queue), 0)
- cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'Spec2': { 'item1': 2 }})
+ cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'item1': 2 })
fake_session.group_sendmsg(cmd, 'Spec2')
self.assertEqual(len(fake_session.message_queue), 1)
mccs.check_command()
@@ -303,12 +303,12 @@
mccs = self.create_session("spec2.spec", None, None, fake_session)
mccs.set_config_handler(self.my_config_handler_err)
self.assertEqual(len(fake_session.message_queue), 0)
- cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'Spec2': { 'item1': 'aaa' }})
+ cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'item1': 'aaa' })
fake_session.group_sendmsg(cmd, 'Spec2')
self.assertEqual(len(fake_session.message_queue), 1)
mccs.check_command()
self.assertEqual(len(fake_session.message_queue), 1)
- self.assertEqual({'result': [1, 'just an error']},
+ self.assertEqual({'result': [1, 'aaa should be an integer']},
fake_session.get_message('Spec2', None))
def test_check_command5(self):
@@ -316,12 +316,12 @@
mccs = self.create_session("spec2.spec", None, None, fake_session)
mccs.set_config_handler(self.my_config_handler_exc)
self.assertEqual(len(fake_session.message_queue), 0)
- cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'Spec2': { 'item1': 'aaa' }})
+ cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'item1': 'aaa' })
fake_session.group_sendmsg(cmd, 'Spec2')
self.assertEqual(len(fake_session.message_queue), 1)
mccs.check_command()
self.assertEqual(len(fake_session.message_queue), 1)
- self.assertEqual({'result': [1, 'just an exception']},
+ self.assertEqual({'result': [1, 'aaa should be an integer']},
fake_session.get_message('Spec2', None))
def test_check_command6(self):
@@ -416,7 +416,7 @@
mccs = self.create_session("spec2.spec", None, None, fake_session)
mccs.set_config_handler(self.my_config_handler_ok)
self.assertEqual(len(fake_session.message_queue), 0)
- cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'Spec2': { 'item1': 2 }})
+ cmd = isc.config.ccsession.create_command(isc.config.ccsession.COMMAND_CONFIG_UPDATE, { 'item1': 2 })
self.assertEqual(len(fake_session.message_queue), 0)
env = { 'group':'Spec2', 'from':None }
mccs.check_command_without_recvmsg(cmd, env)
@@ -559,6 +559,14 @@
mccs.check_command()
self.assertEqual(len(fake_session.message_queue), 0)
+
+class fakeData:
+ def decode(self):
+ return "{}";
+
+class fakeAnswer:
+ def read(self):
+ return fakeData();
class fakeUIConn():
def __init__(self):
@@ -581,7 +589,7 @@
if name in self.post_answers:
return self.post_answers[name]
else:
- return None
+ return fakeAnswer()
class TestUIModuleCCSession(unittest.TestCase):
Modified: branches/trac384/src/lib/python/isc/config/tests/config_data_test.py
==============================================================================
--- branches/trac384/src/lib/python/isc/config/tests/config_data_test.py (original)
+++ branches/trac384/src/lib/python/isc/config/tests/config_data_test.py Mon Jan 3 13:47:41 2011
@@ -335,6 +335,8 @@
pass
def test_get_local_value(self):
+ module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
+ self.mcd.set_specification(module_spec)
value = self.mcd.get_local_value("Spec2/item1")
self.assertEqual(None, value)
self.mcd.set_value("Spec2/item1", 2)
@@ -481,12 +483,11 @@
module_spec = isc.config.module_spec_from_file(self.data_path + os.sep + "spec2.spec")
self.mcd.set_specification(module_spec)
self.mcd.set_value("Spec2/item1", 2)
- self.assertRaises(isc.cc.data.DataTypeError, self.mcd.set_value, "Spec2/item1", "asdf")
-
- self.mcd.set_value("Spec2/no_such_item", 4)
- value, status = self.mcd.get_value("Spec2/no_such_item")
- self.assertEqual(value, 4)
- self.assertEqual(MultiConfigData.LOCAL, status)
+ self.assertRaises(isc.cc.data.DataTypeError,
+ self.mcd.set_value, "Spec2/item1", "asdf")
+
+ self.assertRaises(isc.cc.data.DataNotFoundError,
+ self.mcd.set_value, "Spec2/no_such_item", 4)
self.mcd.set_value("Spec2/item5[0]", "c")
value, status = self.mcd.get_value("Spec2/item5[0]")
Modified: branches/trac384/src/lib/python/isc/config/tests/module_spec_test.py
==============================================================================
--- branches/trac384/src/lib/python/isc/config/tests/module_spec_test.py (original)
+++ branches/trac384/src/lib/python/isc/config/tests/module_spec_test.py Mon Jan 3 13:47:41 2011
@@ -312,6 +312,19 @@
self.assertEqual(False, isc.config.module_spec._validate_spec(spec, True, {}, None))
self.assertEqual(False, isc.config.module_spec._validate_spec(spec, True, {}, errors))
self.assertEqual(['non-optional item an_item missing'], errors)
+
+ def test_validate_unknown_items(self):
+ spec = [{ 'item_name': "an_item",
+ 'item_type': "string",
+ 'item_optional': True,
+ 'item_default': "asdf"
+ }]
+
+ errors = []
+ self.assertEqual(True, isc.config.module_spec._validate_spec_list(spec, True, None, None))
+ self.assertEqual(False, isc.config.module_spec._validate_spec_list(spec, True, { 'does_not_exist': 1 }, None))
+ self.assertEqual(False, isc.config.module_spec._validate_spec_list(spec, True, { 'does_not_exist': 1 }, errors))
+ self.assertEqual(['unknown item does_not_exist'], errors)
Modified: branches/trac384/src/lib/python/isc/datasrc/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/datasrc/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/datasrc/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = master_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/python/isc/log \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/log/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/log/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/log/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = log_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/python/isc/log \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/net/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/net/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/net/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = addr_test.py parse_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/notify/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/notify/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/notify/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,3 +1,4 @@
+PYCOVERAGE_RUN=@PYCOVERAGE_RUN@
PYTESTS = notify_out_test.py
EXTRA_DIST = $(PYTESTS)
@@ -8,13 +9,16 @@
LIBRARY_PATH_PLACEHOLDER += $(ENV_LIBRARY_PATH)=$(abs_top_builddir)/src/lib/dns/.libs:$(abs_top_builddir)/src/lib/exceptions/.libs:$$$(ENV_LIBRARY_PATH)
endif
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
$(LIBRARY_PATH_PLACEHOLDER) \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/python/isc/util/tests/Makefile.am
==============================================================================
--- branches/trac384/src/lib/python/isc/util/tests/Makefile.am (original)
+++ branches/trac384/src/lib/python/isc/util/tests/Makefile.am Mon Jan 3 13:47:41 2011
@@ -1,12 +1,16 @@
+PYCOVERAGE_RUN = @PYCOVERAGE_RUN@
PYTESTS = process_test.py socketserver_mixin_test.py
EXTRA_DIST = $(PYTESTS)
-# later will have configure option to choose this, like: coverage run --branch
-PYCOVERAGE = $(PYTHON)
# test using command-line arguments, so use check-local target instead of TESTS
check-local:
+if ENABLE_PYTHON_COVERAGE
+ touch $(abs_top_srcdir)/.coverage
+ rm -f .coverage
+ ${LN_S} $(abs_top_srcdir)/.coverage .coverage
+endif
for pytest in $(PYTESTS) ; do \
echo Running test: $$pytest ; \
env PYTHONPATH=$(abs_top_srcdir)/src/lib/python:$(abs_top_builddir)/src/lib/python:$(abs_top_builddir)/src/lib/dns/python/.libs \
- $(PYCOVERAGE) $(abs_srcdir)/$$pytest || exit ; \
+ $(PYCOVERAGE_RUN) $(abs_srcdir)/$$pytest || exit ; \
done
Modified: branches/trac384/src/lib/testutils/testdata/Makefile.am
==============================================================================
--- branches/trac384/src/lib/testutils/testdata/Makefile.am (original)
+++ branches/trac384/src/lib/testutils/testdata/Makefile.am Mon Jan 3 13:47:41 2011
@@ -4,6 +4,7 @@
BUILT_SOURCES += iqueryresponse_fromWire.wire multiquestion_fromWire.wire
BUILT_SOURCES += queryBadEDNS_fromWire.wire shortanswer_fromWire.wire
BUILT_SOURCES += simplequery_fromWire.wire simpleresponse_fromWire.wire
+BUILT_SOURCES += iquery_fromWire.wire iquery_response_fromWire.wire
# NOTE: keep this in sync with real file listing
# so is included in tarball
@@ -18,6 +19,8 @@
EXTRA_DIST += shortresponse_fromWire
EXTRA_DIST += simplequery_fromWire.spec
EXTRA_DIST += simpleresponse_fromWire.spec
+EXTRA_DIST += iquery_fromWire.spec iquery_response_fromWire.spec
+EXTRA_DIST += example.com.zone example.net.zone example.org.zone example.zone
EXTRA_DIST += example.com
EXTRA_DIST += example.sqlite3
More information about the bind10-changes
mailing list