BIND 10 trac2208, updated. 82d164c20e0dd8a359b8493a2bc1216436549a4d [2208] Untabify
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Oct 22 02:06:48 UTC 2012
The branch, trac2208 has been updated
via 82d164c20e0dd8a359b8493a2bc1216436549a4d (commit)
via 2fa49003caec9837963fdee5c8ef7ca5ed1b6413 (commit)
via 61256f84ff903ba7f0bddd2569f9fddcdbb194d2 (commit)
from 7b598ee429c070c4c784e41822a4904ee71ebf95 (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 82d164c20e0dd8a359b8493a2bc1216436549a4d
Author: Mukund Sivaraman <muks at isc.org>
Date: Mon Oct 22 07:29:39 2012 +0530
[2208] Untabify
commit 2fa49003caec9837963fdee5c8ef7ca5ed1b6413
Author: Mukund Sivaraman <muks at isc.org>
Date: Mon Oct 22 07:29:31 2012 +0530
[2208] Use consistent naming for ZoneTableSegment variables
commit 61256f84ff903ba7f0bddd2569f9fddcdbb194d2
Author: Mukund Sivaraman <muks at isc.org>
Date: Mon Oct 22 07:15:49 2012 +0530
[2208] Don't use .get() syntax in some places in managed ptrs
-----------------------------------------------------------------------
Summary of changes:
src/bin/auth/tests/auth_srv_unittest.cc | 8 +++----
src/lib/datasrc/client_list.cc | 2 +-
src/lib/datasrc/client_list.h | 9 +++++---
src/lib/datasrc/memory/memory_client.cc | 22 +++++++++---------
src/lib/datasrc/memory/memory_client.h | 4 ++--
src/lib/datasrc/tests/client_list_unittest.cc | 10 ++++----
.../datasrc/tests/memory/memory_client_unittest.cc | 8 +++----
.../datasrc/tests/memory/zone_table_segment_test.h | 4 ++--
.../tests/memory/zone_table_segment_unittest.cc | 24 +++++++++++---------
.../datasrc/tests/zone_finder_context_unittest.cc | 2 +-
10 files changed, 49 insertions(+), 44 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/auth/tests/auth_srv_unittest.cc b/src/bin/auth/tests/auth_srv_unittest.cc
index 402f8b8..fb799fd 100644
--- a/src/bin/auth/tests/auth_srv_unittest.cc
+++ b/src/bin/auth/tests/auth_srv_unittest.cc
@@ -73,6 +73,7 @@ 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;
@@ -1402,8 +1403,7 @@ public:
ConfigurableClientList(RRClass::IN()),
real_(real_list),
config_(Element::fromJSON("{}")),
- segment_(isc::datasrc::memory::ZoneTableSegment::create(
- (*config_.get())))
+ ztable_segment_(ZoneTableSegment::create(*config_))
{
BOOST_FOREACH(const DataSourceInfo& info, real_->getDataSources()) {
const isc::datasrc::DataSourceClientPtr
@@ -1415,13 +1415,13 @@ public:
data_sources_.push_back(
DataSourceInfo(client.get(),
isc::datasrc::DataSourceClientContainerPtr(),
- false, RRClass::IN(), segment_));
+ false, RRClass::IN(), ztable_segment_));
}
}
private:
const boost::shared_ptr<isc::datasrc::ConfigurableClientList> real_;
const ConstElementPtr config_;
- boost::shared_ptr<isc::datasrc::memory::ZoneTableSegment> segment_;
+ boost::shared_ptr<ZoneTableSegment> ztable_segment_;
vector<isc::datasrc::DataSourceClientPtr> clients_;
};
diff --git a/src/lib/datasrc/client_list.cc b/src/lib/datasrc/client_list.cc
index c76ac9c..348ef8e 100644
--- a/src/lib/datasrc/client_list.cc
+++ b/src/lib/datasrc/client_list.cc
@@ -93,7 +93,7 @@ ConfigurableClientList::configure(const ConstElementPtr& config,
try {
vector<DataSourceInfo> new_data_sources;
shared_ptr<ZoneTableSegment> ztable_segment(
- ZoneTableSegment::create(*config.get()));
+ ZoneTableSegment::create(*config));
for (; i < config->size(); ++i) {
// Extract the parameters
const ConstElementPtr dconf(config->get(i));
diff --git a/src/lib/datasrc/client_list.h b/src/lib/datasrc/client_list.h
index 70de66d..d75c153 100644
--- a/src/lib/datasrc/client_list.h
+++ b/src/lib/datasrc/client_list.h
@@ -300,14 +300,17 @@ public:
/// \todo The content yet to be defined.
struct DataSourceInfo {
// Plays a role of default constructor too (for vector)
- DataSourceInfo(const dns::RRClass& rrclass, boost::shared_ptr
- <isc::datasrc::memory::ZoneTableSegment>& segment,
+ DataSourceInfo(const dns::RRClass& rrclass,
+ boost::shared_ptr
+ <isc::datasrc::memory::ZoneTableSegment>&
+ ztable_segment,
bool has_cache = false);
DataSourceInfo(DataSourceClient* data_src_client,
const DataSourceClientContainerPtr& container,
bool has_cache, const dns::RRClass& rrclass,
boost::shared_ptr
- <isc::datasrc::memory::ZoneTableSegment>& segment);
+ <isc::datasrc::memory::ZoneTableSegment>&
+ ztable_segment);
DataSourceClient* data_src_client_;
DataSourceClientContainerPtr container_;
diff --git a/src/lib/datasrc/memory/memory_client.cc b/src/lib/datasrc/memory/memory_client.cc
index 0b754b1..60e797d 100644
--- a/src/lib/datasrc/memory/memory_client.cc
+++ b/src/lib/datasrc/memory/memory_client.cc
@@ -66,18 +66,18 @@ public:
} // end of unnamed namespace
-InMemoryClient::InMemoryClient(shared_ptr<ZoneTableSegment> zone_table_segment,
+InMemoryClient::InMemoryClient(shared_ptr<ZoneTableSegment> ztable_segment,
RRClass rrclass) :
- zone_table_segment_(zone_table_segment),
+ ztable_segment_(ztable_segment),
rrclass_(rrclass),
zone_count_(0),
file_name_tree_(FileNameTree::create(
- zone_table_segment_->getMemorySegment(), false))
+ ztable_segment_->getMemorySegment(), false))
{
}
InMemoryClient::~InMemoryClient() {
- MemorySegment& mem_sgmt = zone_table_segment_->getMemorySegment();
+ MemorySegment& mem_sgmt = ztable_segment_->getMemorySegment();
FileNameDeleter deleter;
FileNameTree::destroy(mem_sgmt, file_name_tree_, deleter);
}
@@ -87,7 +87,7 @@ InMemoryClient::loadInternal(const isc::dns::Name& zone_name,
const std::string& filename,
ZoneData* zone_data)
{
- MemorySegment& mem_sgmt = zone_table_segment_->getMemorySegment();
+ MemorySegment& mem_sgmt = ztable_segment_->getMemorySegment();
SegmentObjectHolder<ZoneData, RRClass> holder(
mem_sgmt, zone_data, rrclass_);
@@ -112,7 +112,7 @@ InMemoryClient::loadInternal(const isc::dns::Name& zone_name,
const std::string* tstr = node->setData(new std::string(filename));
delete tstr;
- ZoneTable* zone_table = zone_table_segment_->getHeader().getTable();
+ ZoneTable* zone_table = ztable_segment_->getHeader().getTable();
const ZoneTable::AddResult result(zone_table->addZone(mem_sgmt, rrclass_,
zone_name,
holder.release()));
@@ -144,7 +144,7 @@ InMemoryClient::findZone(const isc::dns::Name& zone_name) const {
LOG_DEBUG(logger, DBG_TRACE_DATA,
DATASRC_MEMORY_MEM_FIND_ZONE).arg(zone_name);
- const ZoneTable* zone_table = zone_table_segment_->getHeader().getTable();
+ const ZoneTable* zone_table = ztable_segment_->getHeader().getTable();
ZoneTable::FindResult result(zone_table->findZone(zone_name));
ZoneFinderPtr finder;
@@ -157,7 +157,7 @@ InMemoryClient::findZone(const isc::dns::Name& zone_name) const {
const ZoneData*
InMemoryClient::findZoneData(const isc::dns::Name& zone_name) {
- const ZoneTable* zone_table = zone_table_segment_->getHeader().getTable();
+ const ZoneTable* zone_table = ztable_segment_->getHeader().getTable();
ZoneTable::FindResult result(zone_table->findZone(zone_name));
return (result.zone_data);
}
@@ -169,7 +169,7 @@ InMemoryClient::load(const isc::dns::Name& zone_name,
LOG_DEBUG(logger, DBG_TRACE_BASIC, DATASRC_MEMORY_MEM_LOAD).arg(zone_name).
arg(filename);
- MemorySegment& mem_sgmt = zone_table_segment_->getMemorySegment();
+ MemorySegment& mem_sgmt = ztable_segment_->getMemorySegment();
ZoneData* zone_data = loadZoneData(mem_sgmt, rrclass_, zone_name,
filename);
return (loadInternal(zone_name, filename, zone_data));
@@ -177,7 +177,7 @@ InMemoryClient::load(const isc::dns::Name& zone_name,
result::Result
InMemoryClient::load(const isc::dns::Name& zone_name, ZoneIterator& iterator) {
- MemorySegment& mem_sgmt = zone_table_segment_->getMemorySegment();
+ MemorySegment& mem_sgmt = ztable_segment_->getMemorySegment();
ZoneData* zone_data = loadZoneData(mem_sgmt, rrclass_, zone_name,
iterator);
return (loadInternal(zone_name, string(), zone_data));
@@ -309,7 +309,7 @@ public:
ZoneIteratorPtr
InMemoryClient::getIterator(const Name& name, bool separate_rrs) const {
- const ZoneTable* zone_table = zone_table_segment_->getHeader().getTable();
+ const ZoneTable* zone_table = ztable_segment_->getHeader().getTable();
ZoneTable::FindResult result(zone_table->findZone(name));
if (result.code != result::SUCCESS) {
isc_throw(DataSourceError, "No such zone: " + name.toText());
diff --git a/src/lib/datasrc/memory/memory_client.h b/src/lib/datasrc/memory/memory_client.h
index b3417d2..0aaf611 100644
--- a/src/lib/datasrc/memory/memory_client.h
+++ b/src/lib/datasrc/memory/memory_client.h
@@ -63,7 +63,7 @@ public:
/// This constructor internally involves resource allocation, and if
/// it fails, a corresponding standard exception will be thrown.
/// It never throws an exception otherwise.
- InMemoryClient(boost::shared_ptr<ZoneTableSegment> zone_table_segment,
+ InMemoryClient(boost::shared_ptr<ZoneTableSegment> ztable_segment,
isc::dns::RRClass rrclass);
/// The destructor.
@@ -189,7 +189,7 @@ private:
const std::string& filename,
ZoneData* zone_data);
- boost::shared_ptr<ZoneTableSegment> zone_table_segment_;
+ boost::shared_ptr<ZoneTableSegment> ztable_segment_;
const isc::dns::RRClass rrclass_;
unsigned int zone_count_;
FileNameTree* file_name_tree_;
diff --git a/src/lib/datasrc/tests/client_list_unittest.cc b/src/lib/datasrc/tests/client_list_unittest.cc
index 8df18fc..7d92329 100644
--- a/src/lib/datasrc/tests/client_list_unittest.cc
+++ b/src/lib/datasrc/tests/client_list_unittest.cc
@@ -257,7 +257,7 @@ public:
" \"noiter.org\", \"null.org\"]"
"}]")),
config_(Element::fromJSON("{}")),
- segment_(ZoneTableSegment::create((*config_.get())))
+ ztable_segment_(ZoneTableSegment::create(*config_))
{
for (size_t i(0); i < ds_count; ++ i) {
shared_ptr<MockDataSourceClient>
@@ -265,7 +265,7 @@ public:
ds_.push_back(ds);
ds_info_.push_back(ConfigurableClientList::DataSourceInfo(
ds.get(), DataSourceClientContainerPtr(),
- false, rrclass_, segment_));
+ false, rrclass_, ztable_segment_));
}
}
@@ -285,8 +285,8 @@ public:
// Create cache from the temporary data source, and push it to the
// client list.
- const shared_ptr<InMemoryClient> cache(new InMemoryClient(segment_,
- rrclass_));
+ const shared_ptr<InMemoryClient> cache(
+ new InMemoryClient(ztable_segment_, rrclass_));
cache->load(zone, *mock_client.getIterator(zone, false));
ConfigurableClientList::DataSourceInfo& dsrc_info =
@@ -369,7 +369,7 @@ public:
vector<shared_ptr<MockDataSourceClient> > ds_;
vector<ConfigurableClientList::DataSourceInfo> ds_info_;
const ConstElementPtr config_elem_, config_elem_zones_, config_;
- shared_ptr<ZoneTableSegment> segment_;
+ shared_ptr<ZoneTableSegment> ztable_segment_;
};
// Test the test itself
diff --git a/src/lib/datasrc/tests/memory/memory_client_unittest.cc b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
index e6a53db..c9d61d9 100644
--- a/src/lib/datasrc/tests/memory/memory_client_unittest.cc
+++ b/src/lib/datasrc/tests/memory/memory_client_unittest.cc
@@ -161,9 +161,9 @@ public:
class MemoryClientTest : public ::testing::Test {
protected:
MemoryClientTest() : zclass_(RRClass::IN()),
- segment_(new test::ZoneTableSegmentTest(
+ ztable_segment_(new test::ZoneTableSegmentTest(
zclass_, mem_sgmt_)),
- client_(new InMemoryClient(segment_, zclass_))
+ client_(new InMemoryClient(ztable_segment_, zclass_))
{}
~MemoryClientTest() {
delete client_;
@@ -171,12 +171,12 @@ protected:
void TearDown() {
delete client_;
client_ = NULL;
- segment_.reset();
+ ztable_segment_.reset();
EXPECT_TRUE(mem_sgmt_.allMemoryDeallocated()); // catch any leak here.
}
const RRClass zclass_;
test::MemorySegmentTest mem_sgmt_;
- shared_ptr<ZoneTableSegment> segment_;
+ shared_ptr<ZoneTableSegment> ztable_segment_;
InMemoryClient* client_;
};
diff --git a/src/lib/datasrc/tests/memory/zone_table_segment_test.h b/src/lib/datasrc/tests/memory/zone_table_segment_test.h
index 0b995aa..d5613ec 100644
--- a/src/lib/datasrc/tests/memory/zone_table_segment_test.h
+++ b/src/lib/datasrc/tests/memory/zone_table_segment_test.h
@@ -29,10 +29,10 @@ namespace test {
class ZoneTableSegmentTest : public ZoneTableSegment {
public:
ZoneTableSegmentTest(isc::dns::RRClass rrclass,
- isc::util::MemorySegment& mem_sgmt) :
+ isc::util::MemorySegment& mem_sgmt) :
ZoneTableSegment(rrclass),
mem_sgmt_(mem_sgmt),
- header_(ZoneTable::create(mem_sgmt_, rrclass))
+ header_(ZoneTable::create(mem_sgmt_, rrclass))
{}
virtual ~ZoneTableSegmentTest() {
diff --git a/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc b/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
index 1d62c70..41c9cf7 100644
--- a/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
+++ b/src/lib/datasrc/tests/memory/zone_table_segment_unittest.cc
@@ -30,36 +30,37 @@ namespace {
class ZoneTableSegmentTest : public ::testing::Test {
protected:
ZoneTableSegmentTest() :
- segment_(new test::ZoneTableSegmentTest(RRClass::IN(), mem_sgmt_))
+ ztable_segment_(new test::ZoneTableSegmentTest(RRClass::IN(),
+ mem_sgmt_))
{}
~ZoneTableSegmentTest() {
- delete segment_;
+ delete ztable_segment_;
}
void TearDown() {
- ZoneTableSegment::destroy(segment_);
- segment_ = NULL;
+ ZoneTableSegment::destroy(ztable_segment_);
+ ztable_segment_ = NULL;
// Catch any future leaks here.
EXPECT_TRUE(mem_sgmt_.allMemoryDeallocated());
}
MemorySegmentLocal mem_sgmt_;
- ZoneTableSegment* segment_;
+ ZoneTableSegment* ztable_segment_;
};
TEST_F(ZoneTableSegmentTest, create) {
// By default, a local zone table segment is created.
- EXPECT_NE(static_cast<void*>(NULL), segment_);
+ EXPECT_NE(static_cast<void*>(NULL), ztable_segment_);
}
// Helper function to check const and non-const methods.
template <typename TS, typename TH, typename TT>
void
-testGetHeader(ZoneTableSegment* segment) {
- TH& header = static_cast<TS*>(segment)->getHeader();
+testGetHeader(ZoneTableSegment* ztable_segment) {
+ TH& header = static_cast<TS*>(ztable_segment)->getHeader();
// The zone table must be set.
TT* table = header.getTable();
@@ -68,16 +69,17 @@ testGetHeader(ZoneTableSegment* segment) {
TEST_F(ZoneTableSegmentTest, getHeader) {
// non-const version.
- testGetHeader<ZoneTableSegment, ZoneTableHeader, ZoneTable>(segment_);
+ testGetHeader<ZoneTableSegment, ZoneTableHeader, ZoneTable>
+ (ztable_segment_);
// const version.
testGetHeader<const ZoneTableSegment, const ZoneTableHeader,
- const ZoneTable>(segment_);
+ const ZoneTable>(ztable_segment_);
}
TEST_F(ZoneTableSegmentTest, getMemorySegment) {
// This doesn't do anything fun except test the API.
- MemorySegment& mem_sgmt = segment_->getMemorySegment();
+ MemorySegment& mem_sgmt = ztable_segment_->getMemorySegment();
mem_sgmt.allMemoryDeallocated(); // use mem_sgmt
}
diff --git a/src/lib/datasrc/tests/zone_finder_context_unittest.cc b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
index e89d7fc..d213a00 100644
--- a/src/lib/datasrc/tests/zone_finder_context_unittest.cc
+++ b/src/lib/datasrc/tests/zone_finder_context_unittest.cc
@@ -67,7 +67,7 @@ createInMemoryClient(RRClass zclass, const Name& zname)
{
const ElementPtr config(Element::fromJSON("{}"));
shared_ptr<ZoneTableSegment> ztable_segment(
- ZoneTableSegment::create(*config.get()));
+ ZoneTableSegment::create(*config));
shared_ptr<InMemoryClient> client(new InMemoryClient(ztable_segment,
zclass));
client->load(zname, TEST_ZONE_FILE);
More information about the bind10-changes
mailing list