Merge branch 'master' into trac2155_2

Conflicts:
	doc/Doxyfile
	src/bin/auth/Makefile.am
	src/bin/auth/benchmarks/Makefile.am
	src/bin/auth/statistics.h
	src/bin/auth/tests/Makefile.am
	src/bin/auth/tests/auth_srv_unittest.cc

diff --cc doc/Doxyfile
index 9f0f7f176de3ad1b20d66dda27b6256ad9a782d5,f6b9fa00948b628c7efcb31ca8a7bf2e04b14b68..cc3b5959d70e58d43fff364c680d8cebc1d5bc1c
--- 1/doc/Doxyfile
--- 2/doc/Doxyfile
+++ b/doc/Doxyfile
@@@ -579,8 -579,9 +579,9 @@@ INPUT                  = ../src/lib/exc
      ../src/lib/log/compiler ../src/lib/asiolink/ ../src/lib/nsas \
      ../src/lib/testutils ../src/lib/cache ../src/lib/server_common/ \
      ../src/bin/sockcreator/ ../src/lib/util/ ../src/lib/util/io/ \
-     ../src/lib/resolve ../src/lib/acl ../src/lib/statistics ../src/lib/dhcp \
-     ../src/bin/dhcp6 ../src/bin/dhcp4 ../tests/tools/perfdhcp devel
+     ../src/lib/util/threads/ ../src/lib/resolve ../src/lib/acl \
 -    ../src/bin/dhcp6 ../src/lib/dhcp ../src/bin/dhcp4 \
++    ../src/lib/statistics ../src/bin/dhcp6 ../src/lib/dhcp ../src/bin/dhcp4 \
+     ../tests/tools/perfdhcp devel
  
  # This tag can be used to specify the character encoding of the source files
  # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is

diff --cc src/bin/auth/Makefile.am
index 2060ad65df471f98a290dd5593ee0d6d54e93acd,6ee6677607fe3aab27a02b586f58cde797deaf13..7d29fccdcb9c16d3583c0811331b5856b68044c9
--- 1/src/bin/auth/Makefile.am
--- 2/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@@ -54,8 -54,9 +54,9 @@@ b10_auth_SOURCES += auth_log.cc auth_lo
  b10_auth_SOURCES += auth_config.cc auth_config.h
  b10_auth_SOURCES += command.cc command.h
  b10_auth_SOURCES += common.h common.cc
 -b10_auth_SOURCES += statistics.cc statistics.h
 +b10_auth_SOURCES += statistics.cc statistics.h statistics_items.h
- b10_auth_SOURCES += datasrc_configurator.h
+ b10_auth_SOURCES += datasrc_clients_mgr.h
+ b10_auth_SOURCES += datasrc_config.h datasrc_config.cc
  b10_auth_SOURCES += main.cc
  
  nodist_b10_auth_SOURCES = auth_messages.h auth_messages.cc
@@@ -73,6 -74,8 +74,7 @@@ b10_auth_LDADD += $(top_builddir)/src/l
  b10_auth_LDADD += $(top_builddir)/src/lib/log/libb10-log.la
  b10_auth_LDADD += $(top_builddir)/src/lib/xfr/libb10-xfr.la
  b10_auth_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
 -b10_auth_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
+ b10_auth_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
  b10_auth_LDADD += $(SQLITE_LIBS)
  
  # TODO: config.h.in is wrong because doesn't honor pkgdatadir

diff --cc src/bin/auth/auth_srv.cc
Simple merge

diff --cc src/bin/auth/auth_srv.h
Simple merge

diff --cc src/bin/auth/benchmarks/Makefile.am
index 35e31798d20fa110451e55fb1d1f744df79bae94,c525b665d330d361aa49fcd1ebd5ac14aa3e0ccf..27ddfc554c83a288577530fa98dd8b4aa2a399ee
--- 1/src/bin/auth/benchmarks/Makefile.am
--- 2/src/bin/auth/benchmarks/Makefile.am
+++ b/src/bin/auth/benchmarks/Makefile.am
@@@ -15,8 -15,9 +15,9 @@@ query_bench_SOURCES = query_bench.c
  query_bench_SOURCES += ../query.h  ../query.cc
  query_bench_SOURCES += ../auth_srv.h ../auth_srv.cc
  query_bench_SOURCES += ../auth_config.h ../auth_config.cc
 -query_bench_SOURCES += ../statistics.h ../statistics.cc
 +query_bench_SOURCES += ../statistics.h ../statistics.cc ../statistics_items.h
  query_bench_SOURCES += ../auth_log.h ../auth_log.cc
+ query_bench_SOURCES += ../datasrc_config.h ../datasrc_config.cc
  
  nodist_query_bench_SOURCES = ../auth_messages.h ../auth_messages.cc
  
@@@ -33,5 -34,7 +34,6 @@@ query_bench_LDADD += $(top_builddir)/sr
  query_bench_LDADD += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
  query_bench_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
  query_bench_LDADD += $(top_builddir)/src/lib/asiodns/libb10-asiodns.la
 -query_bench_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
+ query_bench_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
  query_bench_LDADD += $(SQLITE_LIBS)
  

diff --cc src/bin/auth/statistics.h
index 323c32fa89cd8a3d4f0fe3be38ab2acc5bc9b3e2,d5700addd3597a434df60c667f3b233068509d12..d60c6814a44da918fe6aafbdd598be442d54faaa
--- 1/src/bin/auth/statistics.h
--- 2/src/bin/auth/statistics.h
+++ b/src/bin/auth/statistics.h
@@@ -12,9 -12,11 +12,9 @@@
  // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  // PERFORMANCE OF THIS SOFTWARE.
  
- #ifndef __STATISTICS_H
- #define __STATISTICS_H 1
+ #ifndef STATISTICS_H
+ #define STATISTICS_H 1
  
 -#include <dns/opcode.h>
 -#include <dns/rcode.h>
  #include <cc/session.h>
  #include <cc/data.h>
  
@@@ -216,14 -175,10 +216,14 @@@ public
      /// \param validator A function type of the validation of
      /// statistics specification.
      ///
 -    void registerStatisticsValidator(AuthCounters::validator_type validator) const;
 +    void registerStatisticsValidator(Counters::validator_type validator) const;
  };
  
- #endif // __STATISTICS_H
 +} // namespace statistics
 +} // namespace auth
 +} // namespace isc
 +
+ #endif // STATISTICS_H
  
  // Local Variables:
  // mode: c++

diff --cc src/bin/auth/tests/Makefile.am
index 482a4f7469763c29f42e833d5c8a59beb9567833,3138c27aeef9747fcd3cfa33790aa4f45ad9a8d8..6a91309011840812973e1d97c2c7534d2708e93f
--- 1/src/bin/auth/tests/Makefile.am
--- 2/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@@ -41,7 -41,8 +41,8 @@@ run_unittests_SOURCES += ../query.h ../
  run_unittests_SOURCES += ../auth_config.h ../auth_config.cc
  run_unittests_SOURCES += ../command.h ../command.cc
  run_unittests_SOURCES += ../common.h ../common.cc
 -run_unittests_SOURCES += ../statistics.h ../statistics.cc
 +run_unittests_SOURCES += ../statistics.h ../statistics.cc ../statistics_items.h
+ run_unittests_SOURCES += ../datasrc_config.h ../datasrc_config.cc
  run_unittests_SOURCES += datasrc_util.h datasrc_util.cc
  run_unittests_SOURCES += auth_srv_unittest.cc
  run_unittests_SOURCES += config_unittest.cc
@@@ -71,7 -75,9 +75,8 @@@ run_unittests_LDADD += $(top_builddir)/
  run_unittests_LDADD += $(top_builddir)/src/lib/server_common/libb10-server-common.la
  run_unittests_LDADD += $(top_builddir)/src/lib/nsas/libb10-nsas.la
  run_unittests_LDADD += $(top_builddir)/src/lib/util/unittests/libutil_unittests.la
 -run_unittests_LDADD += $(top_builddir)/src/lib/statistics/libb10-statistics.la
  run_unittests_LDADD += $(top_builddir)/src/lib/config/tests/libfake_session.la
+ run_unittests_LDADD += $(top_builddir)/src/lib/util/threads/libb10-threads.la
  run_unittests_LDADD += $(GTEST_LDADD)
  run_unittests_LDADD += $(SQLITE_LIBS)
  

diff --cc src/bin/auth/tests/auth_srv_unittest.cc
index 77ecccf71da9317594bcc3ef99bb73d9e1cb8a57,8ebf4e3e1aa7ec1b596d238bf1752e58eb01e0c4..0cd3420d3301376d08a17ee98db45d7ae54024d0
--- 1/src/bin/auth/tests/auth_srv_unittest.cc
--- 2/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@@ -36,8 -35,7 +35,8 @@@
  #include <auth/command.h>
  #include <auth/common.h>
  #include <auth/statistics.h>
- #include <auth/datasrc_configurator.h>
 +#include <auth/statistics_items.h>
+ #include <auth/datasrc_config.h>
  
  #include <util/unittests/mock_socketsession.h>
  #include <dns/tests/unittest_util.h>
@@@ -73,9 -73,9 +74,10 @@@ using namespace isc::asiodns
  using namespace isc::asiolink;
  using namespace isc::testutils;
  using namespace isc::server_common::portconfig;
+ using isc::datasrc::memory::ZoneTableSegment;
  using isc::UnitTestUtil;
  using boost::scoped_ptr;
 +using isc::auth::statistics::Counters;
  
  namespace {
  const char* const CONFIG_TESTDB =

diff --cc src/lib/statistics/counter.h
index a5a1a1dcc6452e32dd88b9dd45eafad360f57d35,9d67b1a4eaa0855abd143aaeec4d9170ab69ff11..af52da412609f635175bb54457240cba16745256
--- 1/src/lib/statistics/counter.h
--- 2/src/lib/statistics/counter.h
+++ b/src/lib/statistics/counter.h
@@@ -12,11 -12,9 +12,11 @@@
  // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  // PERFORMANCE OF THIS SOFTWARE.
  
- #ifndef __COUNTER_H
- #define __COUNTER_H 1
+ #ifndef COUNTER_H
+ #define COUNTER_H 1
  
 +#include <exceptions/exceptions.h>
 +
  #include <boost/noncopyable.hpp>
  #include <boost/scoped_ptr.hpp>
  

diff --cc src/lib/statistics/counter_dict.h
index 863c0fb831218eb3280cf48ae0760910ef4cc2c8,1beff44526608e54aaffecb6dfbdeaf1c09e3a88..e288dfef2fb21eee31d86cc54fad880b9d719b44
--- 1/src/lib/statistics/counter_dict.h
--- 2/src/lib/statistics/counter_dict.h
+++ b/src/lib/statistics/counter_dict.h
@@@ -12,29 -12,18 +12,29 @@@
  // OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
  // PERFORMANCE OF THIS SOFTWARE.
  
- #ifndef __COUNTER_DICT_H
- #define __COUNTER_DICT_H 1
+ #ifndef COUNTER_DICT_H
+ #define COUNTER_DICT_H 1
  
 -#include <string>
 -#include <vector>
 -#include <utility>
 +#include <statistics/counter.h>
 +#include <exceptions/exceptions.h>
 +
  #include <boost/noncopyable.hpp>
  #include <boost/scoped_ptr.hpp>
 +#include <boost/shared_ptr.hpp>
  #include <boost/iterator/iterator_facade.hpp>
  
 -#include <exceptions/exceptions.h>
 -#include <statistics/counter.h>
 +#include <cassert>
 +#include <stdexcept>
 +#include <string>
 +#include <vector>
 +#include <map>
 +#include <iterator>
 +#include <utility>
 +
 +namespace {
 +typedef boost::shared_ptr<isc::statistics::Counter> CounterPtr;
 +typedef std::map<std::string, CounterPtr> DictionaryMap;
 +}
  
  namespace isc {
  namespace statistics {