BIND 10 trac2157, updated. 08807466356cb03b0989a05a942940a5d528de60 [2157] remove meaningless const

BIND 10 source code commits bind10-changes at lists.isc.org
Mon Aug 27 07:59:32 UTC 2012


The branch, trac2157 has been updated
       via  08807466356cb03b0989a05a942940a5d528de60 (commit)
       via  87c49c1618f7714dd6c6018d9ea038107bb027d3 (commit)
       via  ffe7ffd84083fe3872e8ca2d51679721c6bbba97 (commit)
       via  6760e0477b5be69227239698deee178cfdfdacbb (commit)
       via  d7068237f85bc8e090483e82ffd81155b01cbc69 (commit)
      from  eae57882485d326d0150a41959820f25898f5311 (commit)

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

- Log -----------------------------------------------------------------
commit 08807466356cb03b0989a05a942940a5d528de60
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Mon Aug 27 16:58:33 2012 +0900

    [2157] remove meaningless const

commit 87c49c1618f7714dd6c6018d9ea038107bb027d3
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Mon Aug 27 16:49:26 2012 +0900

    [2157] update doxygen comments

commit ffe7ffd84083fe3872e8ca2d51679721c6bbba97
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Mon Aug 27 15:41:15 2012 +0900

    [2157] rename some typedefs in accordance with naming convention

commit 6760e0477b5be69227239698deee178cfdfdacbb
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Mon Aug 27 14:34:05 2012 +0900

    [2157] use lookup table for converting from code to counter item

commit d7068237f85bc8e090483e82ffd81155b01cbc69
Author: Yoshitaka Aharen <aharen at jprs.co.jp>
Date:   Thu Aug 16 19:00:24 2012 +0900

    [2157] rename statistics functions in AuthSrv
    
    rename AuthSrv::get() and AuthSrv::dump() to AuthSrv::getStatistics()
    and AuthSrv::dumpStatistics()
    
    Conflicts:
    
    	src/bin/auth/auth_srv.h
    	src/bin/auth/command.cc

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

Summary of changes:
 src/bin/auth/auth_srv.cc                  |    8 +-
 src/bin/auth/auth_srv.h                   |   33 ++-
 src/bin/auth/statistics.cc                |   97 +++------
 src/bin/auth/statistics.h                 |   35 ++--
 src/bin/auth/statistics_items.h           |  310 ++++++++++++++++++++++++++++-
 src/bin/auth/tests/auth_srv_unittest.cc   |   24 +--
 src/bin/auth/tests/statistics_unittest.cc |    5 +-
 7 files changed, 396 insertions(+), 116 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 9e23627..7575633 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -894,13 +894,13 @@ bool AuthSrv::submitStatistics() const {
     return (impl_->counters_.submitStatistics());
 }
 
-const Counters::item_tree_type
-AuthSrv::get(const Counters::item_node_name_set_type& trees) const {
+Counters::ItemTreeType
+AuthSrv::getStatistics(const Counters::ItemNodeNameSetType& trees) const {
     return (impl_->counters_.get(trees));
 }
 
-const Counters::item_tree_type
-AuthSrv::dump() const {
+Counters::ItemTreeType
+AuthSrv::dumpStatistics() const {
     return (impl_->counters_.dump());
 }
 
diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h
index e2817f8..12519c2 100644
--- a/src/bin/auth/auth_srv.h
+++ b/src/bin/auth/auth_srv.h
@@ -253,25 +253,36 @@ public:
     /// session error).
     bool submitStatistics() const;
 
-    /// \brief Get the values of specified counters.
+    /// \brief Get the values of specified statistics counters.
     ///
-    /// This function returns names and values of counter.
+    /// This function returns names and values of counter specified with
+    /// \c items. If \c items is empty, empty map is returned. Duplicated item
+    /// names cannot be specified because \c items is a set.
     ///
-    /// \throw bad_alloc
+    /// \param items A set of item names. An item name must be the name of
+    ///              a sub-tree of statistics items, one of the following:
+    ///                auth.server.qr: Query / Response counters
+    ///                auth.server.socket: Socket statistics
     ///
-    /// \return a tree of statistics items.
-    const isc::auth::statistics::Counters::item_tree_type get(
-        const isc::auth::statistics::Counters::item_node_name_set_type& items)
+    /// \throw std::bad_alloc Internal resource allocation fails.
+    ///
+    /// \return A tree of statistics items formatted in a map.
+    ///         { item_name => item_value, item_name => item_value, ... }
+    ///         See statistics.h for detail.
+    isc::auth::statistics::Counters::ItemTreeType getStatistics(
+        const isc::auth::statistics::Counters::ItemNodeNameSetType& items)
         const;
 
-    /// \brief Dump the values of counters.
+    /// \brief Dump the values of all statistics counters.
     ///
-    /// This function returns names and values of counter.
+    /// This function returns names and values of all counters for testing.
     ///
-    /// \throw bad_alloc
+    /// \throw std::bad_alloc Internal resource allocation fails.
     ///
-    /// \return a tree of statistics items.
-    const isc::auth::statistics::Counters::item_tree_type dump() const;
+    /// \return A tree of statistics items formatted in a map.
+    ///         { item_name => item_value, item_name => item_value, ... }
+    ///         See statistics.h for detail.
+    isc::auth::statistics::Counters::ItemTreeType dumpStatistics() const;
 
     /**
      * \brief Set and get the addresses we listen on.
diff --git a/src/bin/auth/statistics.cc b/src/bin/auth/statistics.cc
index 2a9a058..7b66332 100644
--- a/src/bin/auth/statistics.cc
+++ b/src/bin/auth/statistics.cc
@@ -46,13 +46,13 @@ using namespace isc::auth;
 using namespace isc::statistics;
 
 namespace {
-using namespace isc::data;
 using isc::statistics::Counter;
 using isc::auth::statistics::Counters;
 void
-fillNodes(const Counter& counter, const char* nodename[], const size_t size,
-          const std::string& prefix, Counters::item_tree_type& trees)
+fillNodes(const Counter& counter, const char* const nodename[], const size_t size,
+          const std::string& prefix, Counters::ItemTreeType& trees)
 {
+    using namespace isc::data;
     for (size_t i = 0; i < size; ++i) {
         trees->set (prefix + nodename[i],
                     Element::create( static_cast<long int>( counter.get(i) ) )
@@ -70,10 +70,10 @@ public:
     CountersImpl();
     ~CountersImpl();
     void inc(const QRAttributes& qrattrs, const Message& response);
-    const Counters::item_tree_type
-        get(const Counters::item_node_name_set_type& trees) const;
+    Counters::ItemTreeType
+        get(const Counters::ItemNodeNameSetType& trees) const;
     // Currently for testing purpose only
-    const Counters::item_tree_type dump() const;
+    Counters::ItemTreeType dump() const;
     bool submitStatistics() const;
     void setStatisticsSession(isc::cc::AbstractSession* statistics_session);
     void registerStatisticsValidator (Counters::validator_type validator);
@@ -151,36 +151,9 @@ CountersImpl::inc(const QRAttributes& qrattrs, const Message& response) {
         if (qptr != NULL) {
             // get the qtype code
             const unsigned int qtype = qptr->getType().getCode();
-            if (qtype == 0) {
-                // qtype 0
-                qtype_type = QR_QTYPE_OTHER;
-            } else if (qtype < 52) {
-                // qtype 1..51
-                qtype_type = QR_QTYPE_A + (qtype - 1);
-            } else if (qtype < 55) {
-                // qtype 52..54
-                qtype_type = QR_QTYPE_OTHER;
-            } else if (qtype < 59) {
-                // qtype 55..58
-                qtype_type = QR_QTYPE_HIP + (qtype - 55);
-            } else if (qtype < 99) {
-                // qtype 59..98
-                qtype_type = QR_QTYPE_OTHER;
-            } else if (qtype < 104) {
-                // qtype 99..103
-                qtype_type = QR_QTYPE_SPF + (qtype - 99);
-            } else if (qtype < 249) {
-                // qtype 104..248
-                qtype_type = QR_QTYPE_OTHER;
-            } else if (qtype < 255) {
-                // qtype 249..254
-                qtype_type = QR_QTYPE_TKEY + (qtype - 249);
-            } else if (qtype == 255) {
-                // qtype 255: all records
-                qtype_type = QR_QTYPE_OTHER;
-            } else if (qtype < 258) {
-                // qtype 256..257
-                qtype_type = QR_QTYPE_URI + (qtype - 256);
+            if (qtype < 258) {
+                // qtype 0..257
+                qtype_type = QRQTypeToQRCounterType[qtype];
             } else if (qtype < 32768) {
                 // qtype 258..32767
                 qtype_type = QR_QTYPE_OTHER;
@@ -195,21 +168,7 @@ CountersImpl::inc(const QRAttributes& qrattrs, const Message& response) {
     }
     server_qr_counter_.inc(qtype_type);
     // OPCODE
-    unsigned int opcode_type = QR_OPCODE_OTHER;
-    if (qrattrs.req_opcode_ < 3) {
-        // opcode 0..2
-        opcode_type = QR_OPCODE_QUERY + qrattrs.req_opcode_;
-    } else if (qrattrs.req_opcode_ == 3) {
-        // opcode 3 is reserved
-        opcode_type = QR_OPCODE_OTHER;
-    } else if (qrattrs.req_opcode_ < 6) {
-        // opcode 4..5
-        opcode_type = QR_OPCODE_NOTIFY + (qrattrs.req_opcode_ - 4);
-    } else {
-        // opcode larger than 6 is reserved
-        opcode_type = QR_OPCODE_OTHER;
-    }
-    server_qr_counter_.inc(opcode_type);
+    server_qr_counter_.inc(QROpCodeToQRCounterType[qrattrs.req_opcode_]);
 
     // response
     if (qrattrs.answer_sent_) {
@@ -238,18 +197,9 @@ CountersImpl::inc(const QRAttributes& qrattrs, const Message& response) {
         // RCODE
         const unsigned int rcode = response.getRcode().getCode();
         unsigned int rcode_type = QR_RCODE_OTHER;
-        if (rcode < 11) {
-            // rcode 0..10
-            rcode_type = QR_RCODE_NOERROR + rcode;
-        } else if (rcode < 16) {
-            // rcode 11..15 is reserved
-            rcode_type = QR_RCODE_OTHER;
-        } else if (rcode == 16) {
-            // rcode 16
-            rcode_type = QR_RCODE_BADSIGVERS;
-        } else if (rcode < 23) {
-            // rcode 17..22
-            rcode_type = QR_RCODE_BADKEY + (rcode - 17);
+        if (rcode < 23) {
+            // rcode 0..22
+            rcode_type = QRRCodeToQRCounterType[rcode];
         } else {
             // opcode larger than 22 is reserved or unassigned
             rcode_type = QR_RCODE_OTHER;
@@ -282,6 +232,9 @@ CountersImpl::inc(const QRAttributes& qrattrs, const Message& response) {
                     server_qr_counter_.inc(QR_QRYREFERRAL);
                 }
             }
+        } else if (rcode == Rcode::REFUSED_CODE) {
+            // AuthRej
+            server_qr_counter_.inc(QR_QRYREJECT);
         }
     }
 }
@@ -368,13 +321,13 @@ CountersImpl::registerStatisticsValidator
     validator_ = validator;
 }
 
-const Counters::item_tree_type
-CountersImpl::get(const Counters::item_node_name_set_type& trees) const {
+Counters::ItemTreeType
+CountersImpl::get(const Counters::ItemNodeNameSetType& trees) const {
     using namespace isc::data;
 
-    Counters::item_tree_type item_tree = Element::createMap();
+    Counters::ItemTreeType item_tree = Element::createMap();
 
-    BOOST_FOREACH(const Counters::item_node_name_type& node, trees) {
+    BOOST_FOREACH(const Counters::ItemNodeNameType& node, trees) {
         if (node == "auth.server.qr") {
             fillNodes(server_qr_counter_, QRCounterItemName, QR_COUNTER_TYPES,
                       "auth.server.qr.", item_tree);
@@ -393,11 +346,11 @@ CountersImpl::get(const Counters::item_node_name_set_type& trees) const {
 }
 
 // Currently for testing purpose only
-const Counters::item_tree_type
+Counters::ItemTreeType
 CountersImpl::dump() const {
     using namespace isc::data;
 
-    Counters::item_tree_type item_tree = Element::createMap();
+    Counters::ItemTreeType item_tree = Element::createMap();
 
     fillNodes(server_qr_counter_, QRCounterItemName, QR_COUNTER_TYPES,
               "auth.server.qr.", item_tree);
@@ -415,12 +368,12 @@ Counters::inc(const QRAttributes& qrattrs, const Message& response) {
     impl_->inc(qrattrs, response);
 }
 
-const Counters::item_tree_type
-Counters::get(const Counters::item_node_name_set_type& trees) const {
+Counters::ItemTreeType
+Counters::get(const Counters::ItemNodeNameSetType& trees) const {
     return (impl_->get(trees));
 }
 
-const Counters::item_tree_type
+Counters::ItemTreeType
 Counters::dump() const {
     return (impl_->dump());
 }
diff --git a/src/bin/auth/statistics.h b/src/bin/auth/statistics.h
index c66e2e9..72b3bc0 100644
--- a/src/bin/auth/statistics.h
+++ b/src/bin/auth/statistics.h
@@ -190,35 +190,44 @@ public:
 
     /// \brief item node name
     ///
-    typedef std::string item_node_name_type;
+    typedef std::string ItemNodeNameType;
 
     /// \brief item node set
     ///
-    typedef std::set<item_node_name_type> item_node_name_set_type;
+    typedef std::set<ItemNodeNameType> ItemNodeNameSetType;
 
     /// \brief A type of statistics item tree in isc::data::MapElement.
     ///        { item_name => item_value, item_name => item_value, ... }
     ///        item_name is a string seperated by '.'.
     ///        item_value is an integer.
-    typedef isc::data::ElementPtr item_tree_type;
+    typedef isc::data::ElementPtr ItemTreeType;
 
-    /// \brief Get the values of specified counters.
+    /// \brief Get the values of specified statistics counters.
     ///
-    /// This function returns names and values of counter.
+    /// This function returns names and values of counter specified with
+    /// \c items. If \c items is empty, empty map is returned. Duplicated item
+    /// names cannot be specified because \c items is a set.
     ///
-    /// \throw bad_alloc
+    /// \param items A set of item names. An item name must be the name of
+    ///              a sub-tree of statistics items, one of the following:
+    ///                auth.server.qr: Query / Response counters
+    ///                auth.server.socket: Socket statistics
     ///
-    /// \return a tree of statistics items.
-    const item_tree_type get(const item_node_name_set_type& items) const;
+    /// \throw std::bad_alloc Internal resource allocation fails.
+    ///
+    /// \return A tree of statistics items formatted in a map.
+    ///         { item_name => item_value, item_name => item_value, ... }
+    ItemTreeType get(const ItemNodeNameSetType& items) const;
 
-    /// \brief Dump all of the counters.
+    /// \brief Dump the values of all statistics counters.
     ///
-    /// This function returns names and values of counter.
+    /// This function returns names and values of all counters for testing.
     ///
-    /// \throw bad_alloc
+    /// \throw std::bad_alloc Internal resource allocation fails.
     ///
-    /// \return a tree of statistics items.
-    const item_tree_type dump() const;
+    /// \return A tree of statistics items formatted in a map.
+    ///         { item_name => item_value, item_name => item_value, ... }
+    ItemTreeType dump() const;
 
     /// \brief A type of validation function for the specification in
     /// isc::config::ModuleSpec.
diff --git a/src/bin/auth/statistics_items.h b/src/bin/auth/statistics_items.h
index 46bce64..9404576 100644
--- a/src/bin/auth/statistics_items.h
+++ b/src/bin/auth/statistics_items.h
@@ -72,7 +72,7 @@ enum SocketCounterType {
     SOCKET_COUNTER_TYPES             ///< The number of defined counters
 };
 // item names for socket statistics
-const char *SocketCounterItemName[SOCKET_COUNTER_TYPES] = {
+const char* const SocketCounterItemName[SOCKET_COUNTER_TYPES] = {
     "ipv4.udp.bindfail",
     "ipv4.udp.close",
     "ipv4.udp.conn",
@@ -224,6 +224,7 @@ enum QRCounterType {
     QR_QRYNOAUTHANS,        ///< Number of queries resulted in non-authoritative answer
     QR_QRYREFERRAL,         ///< Number of queries resulted in referral answer
     QR_QRYNXRRSET,          ///< Number of queries resulted in NOERROR but answer RR == 0
+    QR_QRYREJECT,           ///< Number of queries rejected
     // Response Rcodes
     QR_RCODE_NOERROR,       ///< Number of queries resulted in RCODE = 0 (NoError)
     QR_RCODE_FORMERR,       ///< Number of queries resulted in RCODE = 1 (FormErr)
@@ -248,7 +249,7 @@ enum QRCounterType {
     QR_COUNTER_TYPES  ///< The number of defined counters
 };
 // item names for query/response counters
-const char *QRCounterItemName[QR_COUNTER_TYPES] = {
+const char* const QRCounterItemName[QR_COUNTER_TYPES] = {
     "request.v4",
     "request.v6",
     "request.edns0",
@@ -346,6 +347,7 @@ const char *QRCounterItemName[QR_COUNTER_TYPES] = {
     "qrynoauthans",
     "qryreferral",
     "qrynxrrset",
+    "authqryrej",
     "rcode.noerror",
     "rcode.formerr",
     "rcode.servfail",
@@ -367,6 +369,310 @@ const char *QRCounterItemName[QR_COUNTER_TYPES] = {
     "rcode.other"
 };
 
+const int QROpCodeToQRCounterType[16] = {
+    QR_OPCODE_QUERY,
+    QR_OPCODE_IQUERY,
+    QR_OPCODE_STATUS,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_NOTIFY,
+    QR_OPCODE_UPDATE,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER,
+    QR_OPCODE_OTHER
+};
+const int QRQTypeToQRCounterType[258] = {
+    QR_QTYPE_OTHER,
+    QR_QTYPE_A,
+    QR_QTYPE_NS,
+    QR_QTYPE_MD,
+    QR_QTYPE_MF,
+    QR_QTYPE_CNAME,
+    QR_QTYPE_SOA,
+    QR_QTYPE_MB,
+    QR_QTYPE_MG,
+    QR_QTYPE_MR,
+    QR_QTYPE_NULL,
+    QR_QTYPE_WKS,
+    QR_QTYPE_PTR,
+    QR_QTYPE_HINFO,
+    QR_QTYPE_MINFO,
+    QR_QTYPE_MX,
+    QR_QTYPE_TXT,
+    QR_QTYPE_RP,
+    QR_QTYPE_AFSDB,
+    QR_QTYPE_X25,
+    QR_QTYPE_ISDN,
+    QR_QTYPE_RT,
+    QR_QTYPE_NSAP,
+    QR_QTYPE_NSAP_PTR,
+    QR_QTYPE_SIG,
+    QR_QTYPE_KEY,
+    QR_QTYPE_PX,
+    QR_QTYPE_GPOS,
+    QR_QTYPE_AAAA,
+    QR_QTYPE_LOC,
+    QR_QTYPE_NXT,
+    QR_QTYPE_EID,
+    QR_QTYPE_NIMLOC,
+    QR_QTYPE_SRV,
+    QR_QTYPE_ATMA,
+    QR_QTYPE_NAPTR,
+    QR_QTYPE_KX,
+    QR_QTYPE_CERT,
+    QR_QTYPE_A6,
+    QR_QTYPE_DNAME,
+    QR_QTYPE_SINK,
+    QR_QTYPE_OPT,
+    QR_QTYPE_APL,
+    QR_QTYPE_DS,
+    QR_QTYPE_SSHFP,
+    QR_QTYPE_IPSECKEY,
+    QR_QTYPE_RRSIG,
+    QR_QTYPE_NSEC,
+    QR_QTYPE_DNSKEY,
+    QR_QTYPE_DHCID,
+    QR_QTYPE_NSEC3,
+    QR_QTYPE_NSEC3PARAM,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_HIP,
+    QR_QTYPE_NINFO,
+    QR_QTYPE_RKEY,
+    QR_QTYPE_TALINK,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_SPF,
+    QR_QTYPE_UINFO,
+    QR_QTYPE_UID,
+    QR_QTYPE_GID,
+    QR_QTYPE_UNSPEC,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_TKEY,
+    QR_QTYPE_TSIG,
+    QR_QTYPE_IXFR,
+    QR_QTYPE_AXFR,
+    QR_QTYPE_MAILB,
+    QR_QTYPE_MAILA,
+    QR_QTYPE_OTHER,
+    QR_QTYPE_URI,
+    QR_QTYPE_CAA
+};
+const int QRRCodeToQRCounterType[23] = {
+    QR_RCODE_NOERROR,
+    QR_RCODE_FORMERR,
+    QR_RCODE_SERVFAIL,
+    QR_RCODE_NXDOMAIN,
+    QR_RCODE_NOTIMP,
+    QR_RCODE_REFUSED,
+    QR_RCODE_YXDOMAIN,
+    QR_RCODE_YXRRSET,
+    QR_RCODE_NXRRSET,
+    QR_RCODE_NOTAUTH,
+    QR_RCODE_NOTZONE,
+    QR_RCODE_OTHER,
+    QR_RCODE_OTHER,
+    QR_RCODE_OTHER,
+    QR_RCODE_OTHER,
+    QR_RCODE_OTHER,
+    QR_RCODE_BADSIGVERS,
+    QR_RCODE_BADKEY,
+    QR_RCODE_BADTIME,
+    QR_RCODE_BADMODE,
+    QR_RCODE_BADNAME,
+    QR_RCODE_BADALG,
+    QR_RCODE_BADTRUNC
+};
+
 } // anonymous namespace
 
 #endif // __STATISTICS_ITEMS_H
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index e0fbe93..1a65925 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -135,7 +135,7 @@ protected:
     // Checks whether all Rcode counters are set to zero
     void checkAllRcodeCountersZero() const {
         std::map<std::string, ConstElementPtr> stats_map;
-        server.dump()->getValue(stats_map);
+        server.dumpStatistics()->getValue(stats_map);
 
         const std::string rcode_prefix("auth.server.qr.rcode.");
         for (std::map<std::string, ConstElementPtr>::const_iterator
@@ -161,7 +161,7 @@ protected:
         }
 
         std::map<std::string, ConstElementPtr> stats_map;
-        server.dump()->getValue(stats_map);
+        server.dumpStatistics()->getValue(stats_map);
 
         const std::string rcode_prefix("auth.server.qr.rcode.");
         for (std::map<std::string, ConstElementPtr>::const_iterator
@@ -189,7 +189,7 @@ protected:
         }
 
         std::map<std::string, ConstElementPtr> stats_map;
-        server.dump()->getValue(stats_map);
+        server.dumpStatistics()->getValue(stats_map);
 
         const std::string opcode_prefix("auth.server.qr.opcode.");
         for (std::map<std::string, ConstElementPtr>::const_iterator
@@ -463,7 +463,7 @@ TEST_F(AuthSrvTest, TSIGCheckFirst) {
         "It should be unsigned with this error";
     // TSIG should have failed, and so the per opcode counter shouldn't be
     // incremented.
-    ConstElementPtr stats = server.dump();
+    ConstElementPtr stats = server.dumpStatistics();
     EXPECT_EQ(0, stats->get("auth.server.qr.opcode.other")->intValue());
 
     checkAllRcodeCountersZeroExcept(Rcode::NOTAUTH(), 1);
@@ -1090,7 +1090,7 @@ TEST_F(AuthSrvTest,
 // Submit UDP normal query and check query counter
 TEST_F(AuthSrvTest, queryCounterUDPNormal) {
     // The counter should be initialized to 0.
-    ConstElementPtr stats_init = server.dump();
+    ConstElementPtr stats_init = server.dumpStatistics();
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
@@ -1108,7 +1108,7 @@ TEST_F(AuthSrvTest, queryCounterUDPNormal) {
     //   request.tcp, opcode.query, qtype.ns, rcode.refused, response
     // and these counters should not be incremented:
     //   request.tcp
-    ConstElementPtr stats_after = server.dump();
+    ConstElementPtr stats_after = server.dumpStatistics();
     EXPECT_EQ(1, stats_after->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(0, stats_after->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
@@ -1120,7 +1120,7 @@ TEST_F(AuthSrvTest, queryCounterUDPNormal) {
 // Submit TCP normal query and check query counter
 TEST_F(AuthSrvTest, queryCounterTCPNormal) {
     // The counter should be initialized to 0.
-    ConstElementPtr stats_init = server.dump();
+    ConstElementPtr stats_init = server.dumpStatistics();
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
@@ -1138,7 +1138,7 @@ TEST_F(AuthSrvTest, queryCounterTCPNormal) {
     //   request.tcp, opcode.query, qtype.ns, rcode.refused, response
     // and these counters should not be incremented:
     //   request.udp
-    ConstElementPtr stats_after = server.dump();
+    ConstElementPtr stats_after = server.dumpStatistics();
     EXPECT_EQ(0, stats_after->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
@@ -1150,7 +1150,7 @@ TEST_F(AuthSrvTest, queryCounterTCPNormal) {
 // Submit TCP AXFR query and check query counter
 TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
     // The counter should be initialized to 0.
-    ConstElementPtr stats_init = server.dump();
+    ConstElementPtr stats_init = server.dumpStatistics();
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
@@ -1169,7 +1169,7 @@ TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
     //   request.tcp, opcode.query, qtype.axfr
     // and these counters should not be incremented:
     //   request.udp, response
-    ConstElementPtr stats_after = server.dump();
+    ConstElementPtr stats_after = server.dumpStatistics();
     EXPECT_EQ(0, stats_after->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
@@ -1180,7 +1180,7 @@ TEST_F(AuthSrvTest, queryCounterTCPAXFR) {
 // Submit TCP IXFR query and check query counter
 TEST_F(AuthSrvTest, queryCounterTCPIXFR) {
     // The counter should be initialized to 0.
-    ConstElementPtr stats_init = server.dump();
+    ConstElementPtr stats_init = server.dumpStatistics();
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(0, stats_init->get("auth.server.qr.opcode.query")->intValue());
@@ -1199,7 +1199,7 @@ TEST_F(AuthSrvTest, queryCounterTCPIXFR) {
     //   request.tcp, opcode.query, qtype.ixfr
     // and these counters should not be incremented:
     //   request.udp, response
-    ConstElementPtr stats_after = server.dump();
+    ConstElementPtr stats_after = server.dumpStatistics();
     EXPECT_EQ(0, stats_after->get("auth.server.qr.request.udp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.request.tcp")->intValue());
     EXPECT_EQ(1, stats_after->get("auth.server.qr.opcode.query")->intValue());
diff --git a/src/bin/auth/tests/statistics_unittest.cc b/src/bin/auth/tests/statistics_unittest.cc
index d9f18c1..34bb8a3 100644
--- a/src/bin/auth/tests/statistics_unittest.cc
+++ b/src/bin/auth/tests/statistics_unittest.cc
@@ -305,7 +305,7 @@ TEST_F(CountersTest, submitStatisticsWithValidator) {
     EXPECT_FALSE(counters.submitStatistics());
 }
 
-bool checkCountersAllZeroExcept(const Counters::item_tree_type counters,
+bool checkCountersAllZeroExcept(const Counters::ItemTreeType counters,
                                 const std::set<std::string>& except_for) {
     std::map<std::string, ConstElementPtr> stats_map;
     counters->getValue(stats_map);
@@ -357,6 +357,7 @@ TEST_F(CountersTest, incrementNormalQuery) {
     expect_nonzero.insert("auth.server.qr.response");
     expect_nonzero.insert("auth.server.qr.qrynoauthans");
     expect_nonzero.insert("auth.server.qr.rcode.refused");
+    expect_nonzero.insert("auth.server.qr.authqryrej");
     checkCountersAllZeroExcept(counters.dump(), expect_nonzero);
 }
 
@@ -383,7 +384,7 @@ TEST_F(CountersTest, checkDumpItems) {
 TEST_F(CountersTest, checkGetItems) {
     std::map<std::string, ConstElementPtr> stats_map;
 
-    Counters::item_node_name_set_type names;
+    Counters::ItemNodeNameSetType names;
 
     // get "auth.server.qr"
     names.insert("auth.server.qr");



More information about the bind10-changes mailing list