BIND 10 trac2196, updated. d381d2781f7f2a22695d77330be30e9d609bca29 [2196] class name changed and added some comments
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 22 10:52:44 UTC 2012
The branch, trac2196 has been updated
via d381d2781f7f2a22695d77330be30e9d609bca29 (commit)
from 5aa446f33d778f36b2335c33065bc408b15cc9a4 (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 d381d2781f7f2a22695d77330be30e9d609bca29
Author: Kazunori Fujiwara <fujiwara at wide.ad.jp>
Date: Tue Aug 21 20:15:09 2012 +0900
[2196] class name changed and added some comments
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/auth_srv.cc | 4 ++--
src/bin/auth/auth_srv.h | 4 ++--
src/bin/auth/command.cc | 4 +++-
src/bin/auth/statistics.cc | 20 ++++++++++----------
src/bin/auth/statistics.h | 2 +-
src/bin/auth/tests/statistics_unittest.cc | 12 ++++++------
src/lib/statistics/counter.cc | 8 ++++----
src/lib/statistics/counter.h | 2 +-
src/lib/statistics/tests/counter_unittest.cc | 22 +++++++++++-----------
9 files changed, 40 insertions(+), 38 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index ac2c893..3302723 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -860,8 +860,8 @@ AuthSrv::getStatistics(const Counters::item_node_name_set_type& trees) const {
}
const Counters::item_tree_type
-AuthSrv::getStatistics_delta(const Counters::item_node_name_set_type& trees) {
- return (impl_->counters_.get_clear(trees));
+AuthSrv::getStatisticsDelta(const Counters::item_node_name_set_type& trees) {
+ return (impl_->counters_.getClear(trees));
}
const Counters::item_tree_type
diff --git a/src/bin/auth/auth_srv.h b/src/bin/auth/auth_srv.h
index ec0a5d8..9ecbc90 100644
--- a/src/bin/auth/auth_srv.h
+++ b/src/bin/auth/auth_srv.h
@@ -212,14 +212,14 @@ public:
const isc::auth::statistics::Counters::item_node_name_set_type &items)
const;
- /// \brief Get the values of specified counters.
+ /// \brief Get the values of specified counters and clear them.
///
/// This function returns names and values of counter.
///
/// \throw bad_alloc
///
/// \return a tree of statistics items.
- const isc::auth::statistics::Counters::item_tree_type getStatistics_delta(
+ const isc::auth::statistics::Counters::item_tree_type getStatisticsDelta(
const isc::auth::statistics::Counters::item_node_name_set_type &items);
/// \brief Dump the values of counters.
diff --git a/src/bin/auth/command.cc b/src/bin/auth/command.cc
index 3d2174d..e76b412 100644
--- a/src/bin/auth/command.cc
+++ b/src/bin/auth/command.cc
@@ -133,6 +133,7 @@ public:
};
// Handle the "getstats" command. The argument is a list.
+// "getstats_delta" command responds statistics counters.
class GetStatsCommand : public AuthCommand {
public:
virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
@@ -144,13 +145,14 @@ public:
};
// Handle the "getstats_delta" command. The argument is a list.
+// "getstats_delta" command responds statistics counters and clear them.
class GetStatsDeltaCommand : public AuthCommand {
public:
virtual ConstElementPtr exec(AuthSrv& server, isc::data::ConstElementPtr) {
LOG_DEBUG(auth_logger, DBG_AUTH_OPS, AUTH_RECEIVED_GETSTATS);
statistics::Counters::item_node_name_set_type trees;
trees.insert("auth.server.qr");
- return (createAnswer(0, server.getStatistics_delta(trees)));
+ return (createAnswer(0, server.getStatisticsDelta(trees)));
}
};
diff --git a/src/bin/auth/statistics.cc b/src/bin/auth/statistics.cc
index 47739ae..f38cedd 100644
--- a/src/bin/auth/statistics.cc
+++ b/src/bin/auth/statistics.cc
@@ -62,15 +62,15 @@ fillNodes(const Counter &counter, const char *nodename[], const size_t size,
}
void
-fillNodes_clear(Counter &counter, const char *nodename[], const size_t size,
- const std::string &prefix, Counters::item_tree_type &trees)
+fillNodesClear(Counter &counter, const char *nodename[], const size_t size,
+ const std::string &prefix, Counters::item_tree_type &trees)
{
long int value;
for (size_t i = 0; i < size; ++i) {
- value = static_cast<long int>( counter.get_clear(i) );
+ value = static_cast<long int>( counter.getClear(i) );
if (value != 0) {
- trees->set (prefix + nodename[i], Element::create(value));
+ trees->set(prefix + nodename[i], Element::create(value));
}
}
}
@@ -89,7 +89,7 @@ public:
const Counters::item_tree_type
get(const Counters::item_node_name_set_type& trees) const;
const Counters::item_tree_type
- get_clear(const Counters::item_node_name_set_type& trees);
+ getClear(const Counters::item_node_name_set_type& trees);
// Currently for testing purpose only
const Counters::item_tree_type dump() const;
bool submitStatistics() const;
@@ -333,18 +333,18 @@ CountersImpl::get(const Counters::item_node_name_set_type &trees) const {
}
const Counters::item_tree_type
-CountersImpl::get_clear(const Counters::item_node_name_set_type &trees) {
+CountersImpl::getClear(const Counters::item_node_name_set_type &trees) {
using namespace isc::data;
Counters::item_tree_type item_tree = Element::createMap();
BOOST_FOREACH(const Counters::item_node_name_type& node, trees) {
if (node == "auth.server.qr") {
- fillNodes_clear(server_qr_counter_, QRCounterItemName, QR_COUNTER_TYPES,
+ fillNodesClear(server_qr_counter_, QRCounterItemName, QR_COUNTER_TYPES,
"auth.server.qr.", item_tree);
} else if (node == "auth.server.socket") {
// currently not implemented
- fillNodes_clear(server_socket_counter_, SocketCounterItemName,
+ fillNodesClear(server_socket_counter_, SocketCounterItemName,
SOCKET_COUNTER_TYPES, "auth.server.socket.", item_tree);
} else if (node == "auth.zones") {
// currently not implemented
@@ -385,8 +385,8 @@ Counters::get(const Counters::item_node_name_set_type &trees) const {
}
const Counters::item_tree_type
-Counters::get_clear(const Counters::item_node_name_set_type &trees) {
- return (impl_->get_clear(trees));
+Counters::getClear(const Counters::item_node_name_set_type &trees) {
+ return (impl_->getClear(trees));
}
const Counters::item_tree_type
diff --git a/src/bin/auth/statistics.h b/src/bin/auth/statistics.h
index 5e05c6d..be1187f 100644
--- a/src/bin/auth/statistics.h
+++ b/src/bin/auth/statistics.h
@@ -177,7 +177,7 @@ public:
/// \throw bad_alloc
///
/// \return a tree of statistics items whose values are not zero.
- const item_tree_type get_clear(const item_node_name_set_type &items);
+ const item_tree_type getClear(const item_node_name_set_type &items);
/// \brief Dump all of the counters.
///
diff --git a/src/bin/auth/tests/statistics_unittest.cc b/src/bin/auth/tests/statistics_unittest.cc
index 4dfc502..77fe071 100644
--- a/src/bin/auth/tests/statistics_unittest.cc
+++ b/src/bin/auth/tests/statistics_unittest.cc
@@ -125,7 +125,7 @@ TEST_F(CountersTest, incrementNormalQuery_delta) {
names.insert("auth.server.qr");
expect_nonzero.clear();
- checkCountersAllZeroExcept(counters.get_clear(names), expect_nonzero);
+ checkCountersAllZeroExcept(counters.getClear(names), expect_nonzero);
qrattrs.setQueryIPVersion(AF_INET6);
qrattrs.setQueryTransportProtocol(IPPROTO_UDP);
@@ -149,12 +149,12 @@ TEST_F(CountersTest, incrementNormalQuery_delta) {
expect_nonzero.insert("auth.server.qr.response");
expect_nonzero.insert("auth.server.qr.qrynoauthans");
expect_nonzero.insert("auth.server.qr.rcode.refused");
- checkCountersAllZeroExcept(counters.get_clear(names), expect_nonzero);
+ checkCountersAllZeroExcept(counters.getClear(names), expect_nonzero);
expect_nonzero.clear();
- checkCountersAllZeroExcept(counters.get_clear(names), expect_nonzero);
+ checkCountersAllZeroExcept(counters.getClear(names), expect_nonzero);
qrattrs.setQueryIPVersion(AF_INET6);
expect_nonzero.insert("auth.server.qr.qtype.aaaa");
- checkCountersAllZeroExcept(counters.get_clear(names), expect_nonzero);
+ checkCountersAllZeroExcept(counters.getClear(names), expect_nonzero);
}
TEST_F(CountersTest, checkDumpItems) {
@@ -223,7 +223,7 @@ TEST_F(CountersTest, checkGetClearItems) {
// get "auth.server.qr"
names.insert("auth.server.qr");
- counters.get_clear(names)->getValue(stats_map);
+ counters.getClear(names)->getValue(stats_map);
EXPECT_EQ(0, stats_map.size());
qrattrs.setQueryIPVersion(AF_INET6);
@@ -233,7 +233,7 @@ TEST_F(CountersTest, checkGetClearItems) {
qrattrs.setQueryDO(true);
qrattrs.answerHasSent();
- counters.get_clear(names)->getValue(stats_map);
+ counters.getClear(names)->getValue(stats_map);
EXPECT_EQ(0, stats_map.size());
}
diff --git a/src/lib/statistics/counter.cc b/src/lib/statistics/counter.cc
index 62ddd08..e2e9e37 100644
--- a/src/lib/statistics/counter.cc
+++ b/src/lib/statistics/counter.cc
@@ -33,7 +33,7 @@ class CounterImpl : boost::noncopyable {
~CounterImpl();
void inc(const Counter::Type&);
const Counter::Value& get(const Counter::Type&) const;
- const Counter::Value get_clear(const Counter::Type&);
+ const Counter::Value getClear(const Counter::Type&);
};
CounterImpl::CounterImpl(const size_t items) :
@@ -64,7 +64,7 @@ CounterImpl::get(const Counter::Type& type) const {
}
const Counter::Value
-CounterImpl::get_clear(const Counter::Type& type) {
+CounterImpl::getClear(const Counter::Type& type) {
Counter::Value value;
if(type >= counters_.size()) {
isc_throw(isc::OutOfRange, "Counter type is out of range");
@@ -91,8 +91,8 @@ Counter::get(const Type& type) const {
}
const Counter::Value
-Counter::get_clear(const Type& type) {
- return (impl_->get_clear(type));
+Counter::getClear(const Type& type) {
+ return (impl_->getClear(type));
}
} // namespace statistics
diff --git a/src/lib/statistics/counter.h b/src/lib/statistics/counter.h
index 8da4cd9..88cd4fa 100644
--- a/src/lib/statistics/counter.h
+++ b/src/lib/statistics/counter.h
@@ -68,7 +68,7 @@ public:
/// \param type %Counter item to get the value of
///
/// \throw isc::OutOfRange \a type is invalid
- const Value get_clear(const Type& type);
+ const Value getClear(const Type& type);
};
} // namespace statistics
diff --git a/src/lib/statistics/tests/counter_unittest.cc b/src/lib/statistics/tests/counter_unittest.cc
index 67cc2a2..5e05ae0 100644
--- a/src/lib/statistics/tests/counter_unittest.cc
+++ b/src/lib/statistics/tests/counter_unittest.cc
@@ -52,9 +52,9 @@ TEST_F(CounterTest, createCounter) {
TEST_F(CounterTest, createCounter_clear) {
// Check if the all counters are initialized with 0
- EXPECT_EQ(counter.get_clear(ITEM1), 0);
- EXPECT_EQ(counter.get_clear(ITEM2), 0);
- EXPECT_EQ(counter.get_clear(ITEM3), 0);
+ EXPECT_EQ(counter.getClear(ITEM1), 0);
+ EXPECT_EQ(counter.getClear(ITEM2), 0);
+ EXPECT_EQ(counter.getClear(ITEM3), 0);
}
TEST_F(CounterTest, incrementCounterItem) {
@@ -91,9 +91,9 @@ TEST_F(CounterTest, incrementCounterItem_getclear) {
counter.inc(ITEM3);
counter.inc(ITEM3);
// Check if the counters have expected values
- EXPECT_EQ(counter.get_clear(ITEM1), 1);
- EXPECT_EQ(counter.get_clear(ITEM2), 2);
- EXPECT_EQ(counter.get_clear(ITEM3), 3);
+ EXPECT_EQ(counter.getClear(ITEM1), 1);
+ EXPECT_EQ(counter.getClear(ITEM2), 2);
+ EXPECT_EQ(counter.getClear(ITEM3), 3);
// Increment counters once more
counter.inc(ITEM1);
counter.inc(ITEM2);
@@ -102,9 +102,9 @@ TEST_F(CounterTest, incrementCounterItem_getclear) {
counter.inc(ITEM3);
counter.inc(ITEM3);
// Check if the counters have expected values
- EXPECT_EQ(counter.get_clear(ITEM1), 1);
- EXPECT_EQ(counter.get_clear(ITEM2), 2);
- EXPECT_EQ(counter.get_clear(ITEM3), 3);
+ EXPECT_EQ(counter.getClear(ITEM1), 1);
+ EXPECT_EQ(counter.getClear(ITEM2), 2);
+ EXPECT_EQ(counter.getClear(ITEM3), 3);
}
TEST_F(CounterTest, invalidCounterItem) {
@@ -114,7 +114,7 @@ TEST_F(CounterTest, invalidCounterItem) {
// Trying to get out-of-bound counter will cause an isc::OutOfRange
// exception
EXPECT_THROW(counter.get(NUMBER_OF_ITEMS), isc::OutOfRange);
- // Trying to get_clear out-of-bound counter will cause an isc::OutOfRange
+ // Trying to getClear out-of-bound counter will cause an isc::OutOfRange
// exception
- EXPECT_THROW(counter.get_clear(NUMBER_OF_ITEMS), isc::OutOfRange);
+ EXPECT_THROW(counter.getClear(NUMBER_OF_ITEMS), isc::OutOfRange);
}
More information about the bind10-changes
mailing list