BIND 10 trac2156, updated. 239990eda9af74ec251311820e0350a6fa6d848b [2156] rolled back unnecessary change for bin/auth/statistics.cc [2156] removed tab

BIND 10 source code commits bind10-changes at lists.isc.org
Wed Aug 22 11:42:32 UTC 2012


The branch, trac2156 has been updated
       via  239990eda9af74ec251311820e0350a6fa6d848b (commit)
      from  75c02f4e409eb256b68ca187ce52d1b1d05fa62b (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 239990eda9af74ec251311820e0350a6fa6d848b
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date:   Wed Aug 22 20:39:59 2012 +0900

    [2156] rolled back unnecessary change for bin/auth/statistics.cc
    [2156] removed tab

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

Summary of changes:
 src/bin/auth/statistics.cc               |    6 +++---
 src/lib/asiodns/socketstatistics_items.h |   26 +++++++++++++-------------
 2 files changed, 16 insertions(+), 16 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/auth/statistics.cc b/src/bin/auth/statistics.cc
index 2ddf139..4157880 100644
--- a/src/bin/auth/statistics.cc
+++ b/src/bin/auth/statistics.cc
@@ -53,7 +53,7 @@ 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, ElementPtr &trees)
+          const std::string &prefix, Counters::item_tree_type &trees)
 {
     for (size_t i = 0; i < size; ++i) {
         trees->set (prefix + nodename[i],
@@ -296,7 +296,7 @@ const Counters::item_tree_type
 CountersImpl::get(const Counters::item_node_name_set_type &trees) const {
     using namespace isc::data;
 
-    ElementPtr item_tree = Element::createMap();
+    Counters::item_tree_type item_tree = Element::createMap();
 
     BOOST_FOREACH(const Counters::item_node_name_type& node, trees) {
         if (node == "auth.server.qr") {
@@ -321,7 +321,7 @@ const Counters::item_tree_type
 CountersImpl::dump() const {
     using namespace isc::data;
 
-    ElementPtr item_tree = Element::createMap();
+    Counters::item_tree_type item_tree = Element::createMap();
 
     fillNodes(server_qr_counter_, QRCounterItemName, QR_COUNTER_TYPES,
               "auth.server.qr.", item_tree);
diff --git a/src/lib/asiodns/socketstatistics_items.h b/src/lib/asiodns/socketstatistics_items.h
index 5886ea5..18214c8 100644
--- a/src/lib/asiodns/socketstatistics_items.h
+++ b/src/lib/asiodns/socketstatistics_items.h
@@ -23,16 +23,16 @@ namespace {
 // enum for socket statistics
 enum SocketCounterType {
     // Socket statistics
-    SOCKET_ASIODNS_FD_ADD_TCP,		///< adding a new TCP server
-    SOCKET_ASIODNS_FD_ADD_UDP,		///< adding a new UDP server
-    SOCKET_ASIODNS_FETCH_COMPLETED,	///< upstream fetch has now completed
-    SOCKET_ASIODNS_FETCH_STOPPED,	///< upstream fetch has been stopped
-    SOCKET_ASIODNS_OPEN_SOCKET,	///< error opening socket
-    SOCKET_ASIODNS_READ_DATA,		///< error reading data
-    SOCKET_ASIODNS_READ_TIMEOUT,	///< receive timeout
-    SOCKET_ASIODNS_SEND_DATA,		///< error sending data
-    SOCKET_ASIODNS_UNKNOWN_ORIGIN, 	///< unknown origin for ASIO error
-    SOCKET_ASIODNS_UNKNOWN_RESULT,	///< unknown result
+    SOCKET_ASIODNS_FD_ADD_TCP,         ///< adding a new TCP server
+    SOCKET_ASIODNS_FD_ADD_UDP,         ///< adding a new UDP server
+    SOCKET_ASIODNS_FETCH_COMPLETED,    ///< upstream fetch has now completed
+    SOCKET_ASIODNS_FETCH_STOPPED,      ///< upstream fetch has been stopped
+    SOCKET_ASIODNS_SOCKET_OPEN_ERROR,  ///< error opening socket
+    SOCKET_ASIODNS_READ_DATA_ERROR,    ///< error reading data
+    SOCKET_ASIODNS_READ_TIMEOUT,       ///< receive timeout
+    SOCKET_ASIODNS_SEND_DATA_ERROR,    ///< error sending data
+    SOCKET_ASIODNS_UNKNOWN_ORIGIN,     ///< unknown origin for ASIO error
+    SOCKET_ASIODNS_UNKNOWN_RESULT,     ///< unknown result
     SOCKET_ASIODNS_COUNTER_TYPES       ///< The number of defined counters
 };
 // item names for socket statistics
@@ -41,10 +41,10 @@ const char *SocketCounterItemName[SOCKET_ASIODNS_COUNTER_TYPES] = {
     "asiodns_fd_add_udp",
     "asiodns_fetch_completed",
     "asiodns_fetch_stopped",
-    "asiodns_open_socket",
-    "asiodns_read_data",
+    "asiodns_socket_open_error",
+    "asiodns_read_data_error",
     "asiodns_read_timeout",
-    "asiodns_send_data",
+    "asiodns_send_data_error",
     "asiodns_unknown_origin",
     "asiodns_unknown_result",
 };



More information about the bind10-changes mailing list