BIND 10 trac3087, updated. 4d07784b1a5773e5773e1ccb683171e0225a098e [3087] Use IOServicePtr consistently in DHCP-DDNS
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Nov 8 18:57:53 UTC 2013
The branch, trac3087 has been updated
via 4d07784b1a5773e5773e1ccb683171e0225a098e (commit)
from 2e425ff153d59bf8f551c0aec716dce8e2d53996 (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 4d07784b1a5773e5773e1ccb683171e0225a098e
Author: Thomas Markwalder <tmark at isc.org>
Date: Fri Nov 8 13:55:21 2013 -0500
[3087] Use IOServicePtr consistently in DHCP-DDNS
Some classes were using references to isc::asiolink::IOService, others
where using d2::IOServicePtr. The latter is now used throughout for
consistency as well as support for future, possible, multi-threaded
implementation.
-----------------------------------------------------------------------
Summary of changes:
src/bin/d2/Makefile.am | 1 +
src/bin/d2/{d2_log.h => d2_asio.h} | 21 ++++++-----
src/bin/d2/d2_cfg_mgr.h | 2 +-
src/bin/d2/d2_config.h | 2 +-
src/bin/d2/d2_process.cc | 4 +--
src/bin/d2/d2_queue_mgr.cc | 9 +++--
src/bin/d2/d2_queue_mgr.h | 7 ++--
src/bin/d2/d2_update_mgr.cc | 6 +++-
src/bin/d2/d2_update_mgr.h | 6 ++--
src/bin/d2/d_controller.h | 2 +-
src/bin/d2/d_process.h | 4 +--
src/bin/d2/dns_client.cc | 17 +++++----
src/bin/d2/dns_client.h | 6 ++--
src/bin/d2/nc_trans.cc | 11 ++++--
src/bin/d2/nc_trans.h | 6 ++--
src/bin/d2/state_model.h | 1 -
src/bin/d2/tests/Makefile.am | 3 +-
src/bin/d2/tests/d2_queue_mgr_unittests.cc | 39 ++++++++++----------
src/bin/d2/tests/d2_update_mgr_unittests.cc | 9 ++---
src/bin/d2/tests/d_test_stubs.h | 2 +-
src/bin/d2/tests/dns_client_unittests.cc | 16 ++++-----
src/bin/d2/tests/nc_trans_unittests.cc | 9 +++--
src/lib/dhcpsrv/tests/test_libraries.h | 51 ---------------------------
23 files changed, 102 insertions(+), 132 deletions(-)
copy src/bin/d2/{d2_log.h => d2_asio.h} (74%)
delete mode 100644 src/lib/dhcpsrv/tests/test_libraries.h
-----------------------------------------------------------------------
diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index f27fe38..7e8366e 100644
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -50,6 +50,7 @@ BUILT_SOURCES = spec_config.h d2_messages.h d2_messages.cc
pkglibexec_PROGRAMS = b10-dhcp-ddns
b10_dhcp_ddns_SOURCES = main.cc
+b10_dhcp_ddns_SOURCES += d2_asio.h
b10_dhcp_ddns_SOURCES += d2_log.cc d2_log.h
b10_dhcp_ddns_SOURCES += d2_process.cc d2_process.h
b10_dhcp_ddns_SOURCES += d_controller.cc d_controller.h
diff --git a/src/bin/d2/d2_asio.h b/src/bin/d2/d2_asio.h
new file mode 100644
index 0000000..c9458f6
--- /dev/null
+++ b/src/bin/d2/d2_asio.h
@@ -0,0 +1,31 @@
+// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
+//
+// Permission to use, copy, modify, and/or distribute this software for any
+// purpose with or without fee is hereby granted, provided that the above
+// copyright notice and this permission notice appear in all copies.
+//
+// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
+// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
+// AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
+// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
+// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
+// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+// PERFORMANCE OF THIS SOFTWARE.
+
+#ifndef D2_ASIO_H
+#define D2_ASIO_H
+
+#include <asiolink/asiolink.h>
+
+#include <boost/shared_ptr.hpp>
+
+namespace isc {
+namespace d2 {
+
+/// @brief Defines a smart pointer to an IOService instance.
+typedef boost::shared_ptr<isc::asiolink::IOService> IOServicePtr;
+
+}; // namespace isc::d2
+}; // namespace isc
+
+#endif
diff --git a/src/bin/d2/d2_cfg_mgr.h b/src/bin/d2/d2_cfg_mgr.h
index d95a890..ec19d4c 100644
--- a/src/bin/d2/d2_cfg_mgr.h
+++ b/src/bin/d2/d2_cfg_mgr.h
@@ -15,9 +15,9 @@
#ifndef D2_CFG_MGR_H
#define D2_CFG_MGR_H
-#include <asiolink/io_address.h>
#include <cc/data.h>
#include <exceptions/exceptions.h>
+#include <d2/d2_asio.h>
#include <d2/d_cfg_mgr.h>
#include <d2/d2_config.h>
diff --git a/src/bin/d2/d2_config.h b/src/bin/d2/d2_config.h
index 8e3bd34..6eb975e 100644
--- a/src/bin/d2/d2_config.h
+++ b/src/bin/d2/d2_config.h
@@ -15,8 +15,8 @@
#ifndef D2_CONFIG_H
#define D2_CONFIG_H
-#include <asiolink/io_address.h>
#include <cc/data.h>
+#include <d2/d2_asio.h>
#include <d2/d_cfg_mgr.h>
#include <dhcpsrv/dhcp_parsers.h>
#include <exceptions/exceptions.h>
diff --git a/src/bin/d2/d2_process.cc b/src/bin/d2/d2_process.cc
index 63bd6bd..187bfe1 100644
--- a/src/bin/d2/d2_process.cc
+++ b/src/bin/d2/d2_process.cc
@@ -35,13 +35,13 @@ D2Process::D2Process(const char* name, IOServicePtr io_service)
// been received. This means that until we receive the configuration,
// D2 will neither receive nor process NameChangeRequests.
// Pass in IOService for NCR IO event processing.
- queue_mgr_.reset(new D2QueueMgr(*getIoService()));
+ queue_mgr_.reset(new D2QueueMgr(getIoService()));
// Instantiate update manager.
// Pass in both queue manager and configuration manager.
// Pass in IOService for DNS update transaction IO event processing.
D2CfgMgrPtr tmp = getD2CfgMgr();
- update_mgr_.reset(new D2UpdateMgr(queue_mgr_, tmp, *getIoService()));
+ update_mgr_.reset(new D2UpdateMgr(queue_mgr_, tmp, getIoService()));
};
void
diff --git a/src/bin/d2/d2_queue_mgr.cc b/src/bin/d2/d2_queue_mgr.cc
index 4de9c42..041c2e8 100644
--- a/src/bin/d2/d2_queue_mgr.cc
+++ b/src/bin/d2/d2_queue_mgr.cc
@@ -22,10 +22,13 @@ namespace d2 {
// Makes constant visible to Google test macros.
const size_t D2QueueMgr::MAX_QUEUE_DEFAULT;
-D2QueueMgr::D2QueueMgr(isc::asiolink::IOService& io_service,
- const size_t max_queue_size)
+D2QueueMgr::D2QueueMgr(IOServicePtr& io_service, const size_t max_queue_size)
: io_service_(io_service), max_queue_size_(max_queue_size),
mgr_state_(NOT_INITTED), target_stop_state_(NOT_INITTED) {
+ if (!io_service_) {
+ isc_throw(D2QueueMgrError, "IOServicePtr cannot be null");
+ }
+
// Use setter to do validation.
setMaxQueueSize(max_queue_size);
}
@@ -129,7 +132,7 @@ D2QueueMgr::startListening() {
// Instruct the listener to start listening and set state accordingly.
try {
- listener_->startListening(io_service_);
+ listener_->startListening(*io_service_);
mgr_state_ = RUNNING;
} catch (const isc::Exception& ex) {
isc_throw(D2QueueMgrError, "D2QueueMgr listener start failed: "
diff --git a/src/bin/d2/d2_queue_mgr.h b/src/bin/d2/d2_queue_mgr.h
index 8fe078b..c9b0298 100644
--- a/src/bin/d2/d2_queue_mgr.h
+++ b/src/bin/d2/d2_queue_mgr.h
@@ -17,9 +17,8 @@
/// @file d2_queue_mgr.h This file defines the class D2QueueMgr.
-#include <asiolink/io_address.h>
-#include <asiolink/io_service.h>
#include <exceptions/exceptions.h>
+#include <d2/d2_asio.h>
#include <dhcp_ddns/ncr_msg.h>
#include <dhcp_ddns/ncr_io.h>
@@ -166,7 +165,7 @@ public:
/// This value must be greater than zero. It defaults to MAX_QUEUE_DEFAULT.
///
/// @throw D2QueueMgrError if max_queue_size is zero.
- D2QueueMgr(isc::asiolink::IOService& io_service,
+ D2QueueMgr(IOServicePtr& io_service,
const size_t max_queue_size = MAX_QUEUE_DEFAULT);
/// @brief Destructor
@@ -328,7 +327,7 @@ public:
void updateStopState();
/// @brief IOService that our listener should use for IO management.
- isc::asiolink::IOService& io_service_;
+ IOServicePtr io_service_;
/// @brief Dictates the maximum number of entries allowed in the queue.
size_t max_queue_size_;
diff --git a/src/bin/d2/d2_update_mgr.cc b/src/bin/d2/d2_update_mgr.cc
index b88b415..4439cc2 100644
--- a/src/bin/d2/d2_update_mgr.cc
+++ b/src/bin/d2/d2_update_mgr.cc
@@ -24,7 +24,7 @@ namespace d2 {
const size_t D2UpdateMgr::MAX_TRANSACTIONS_DEFAULT;
D2UpdateMgr::D2UpdateMgr(D2QueueMgrPtr& queue_mgr, D2CfgMgrPtr& cfg_mgr,
- isc::asiolink::IOService& io_service,
+ IOServicePtr& io_service,
const size_t max_transactions)
:queue_mgr_(queue_mgr), cfg_mgr_(cfg_mgr), io_service_(io_service) {
if (!queue_mgr_) {
@@ -36,6 +36,10 @@ D2UpdateMgr::D2UpdateMgr(D2QueueMgrPtr& queue_mgr, D2CfgMgrPtr& cfg_mgr,
"D2UpdateMgr configuration manager cannot be null");
}
+ if (!io_service_) {
+ isc_throw(D2UpdateMgrError, "IOServicePtr cannot be null");
+ }
+
// Use setter to do validation.
setMaxTransactions(max_transactions);
}
diff --git a/src/bin/d2/d2_update_mgr.h b/src/bin/d2/d2_update_mgr.h
index 9653253..422049f 100644
--- a/src/bin/d2/d2_update_mgr.h
+++ b/src/bin/d2/d2_update_mgr.h
@@ -17,8 +17,8 @@
/// @file d2_update_mgr.h This file defines the class D2UpdateMgr.
-#include <asiolink/io_service.h>
#include <exceptions/exceptions.h>
+#include <d2/d2_asio.h>
#include <d2/d2_log.h>
#include <d2/d2_queue_mgr.h>
#include <d2/d2_cfg_mgr.h>
@@ -100,7 +100,7 @@ public:
/// @throw D2UpdateMgrError if either the queue manager or configuration
/// managers are NULL, or max transactions is less than one.
D2UpdateMgr(D2QueueMgrPtr& queue_mgr, D2CfgMgrPtr& cfg_mgr,
- isc::asiolink::IOService& io_service,
+ IOServicePtr& io_service,
const size_t max_transactions = MAX_TRANSACTIONS_DEFAULT);
/// @brief Destructor
@@ -228,7 +228,7 @@ private:
/// passed into transactions to manager their IO events.
/// (For future reference, multi-threaded transactions would each use their
/// own IOService instance.)
- isc::asiolink::IOService& io_service_;
+ IOServicePtr io_service_;
/// @brief Maximum number of concurrent transactions.
size_t max_transactions_;
diff --git a/src/bin/d2/d_controller.h b/src/bin/d2/d_controller.h
index 100eb44..917ed64 100644
--- a/src/bin/d2/d_controller.h
+++ b/src/bin/d2/d_controller.h
@@ -15,10 +15,10 @@
#ifndef D_CONTROLLER_H
#define D_CONTROLLER_H
-#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
+#include <d2/d2_asio.h>
#include <d2/d2_log.h>
#include <d2/d_process.h>
#include <exceptions/exceptions.h>
diff --git a/src/bin/d2/d_process.h b/src/bin/d2/d_process.h
index ce86118..7ba74f9 100644
--- a/src/bin/d2/d_process.h
+++ b/src/bin/d2/d_process.h
@@ -15,16 +15,14 @@
#ifndef D_PROCESS_H
#define D_PROCESS_H
-#include <asiolink/asiolink.h>
#include <cc/data.h>
+#include <d2/d2_asio.h>
#include <d2/d_cfg_mgr.h>
#include <boost/shared_ptr.hpp>
#include <exceptions/exceptions.h>
-typedef boost::shared_ptr<isc::asiolink::IOService> IOServicePtr;
-
namespace isc {
namespace d2 {
diff --git a/src/bin/d2/dns_client.cc b/src/bin/d2/dns_client.cc
index a3bff81..6fd36c0 100644
--- a/src/bin/d2/dns_client.cc
+++ b/src/bin/d2/dns_client.cc
@@ -65,7 +65,7 @@ public:
virtual void operator()(asiodns::IOFetch::Result result);
// Starts asynchronous DNS Update.
- void doUpdate(asiolink::IOService& io_service,
+ void doUpdate(IOServicePtr& io_service,
const asiolink::IOAddress& ns_addr,
const uint16_t ns_port,
D2UpdateMessage& update,
@@ -162,7 +162,7 @@ DNSClientImpl::getStatus(const asiodns::IOFetch::Result result) {
}
void
-DNSClientImpl::doUpdate(IOService& io_service,
+DNSClientImpl::doUpdate(IOServicePtr& io_service,
const IOAddress& ns_addr,
const uint16_t ns_port,
D2UpdateMessage& update,
@@ -189,11 +189,11 @@ DNSClientImpl::doUpdate(IOService& io_service,
// Timeout value is explicitly cast to the int type to avoid warnings about
// overflows when doing implicit cast. It should have been checked by the
// caller that the unsigned timeout value will fit into int.
- IOFetch io_fetch(IOFetch::UDP, io_service, msg_buf, ns_addr, ns_port,
+ IOFetch io_fetch(IOFetch::UDP, *io_service, msg_buf, ns_addr, ns_port,
in_buf_, this, static_cast<int>(wait));
// Post the task to the task queue in the IO service. Caller will actually
// run these tasks by executing IOService::run.
- io_service.post(io_fetch);
+ io_service->post(io_fetch);
}
@@ -213,7 +213,7 @@ DNSClient::getMaxTimeout() {
}
void
-DNSClient::doUpdate(IOService&,
+DNSClient::doUpdate(IOServicePtr&,
const IOAddress&,
const uint16_t,
D2UpdateMessage&,
@@ -224,11 +224,16 @@ DNSClient::doUpdate(IOService&,
}
void
-DNSClient::doUpdate(IOService& io_service,
+DNSClient::doUpdate(IOServicePtr& io_service,
const IOAddress& ns_addr,
const uint16_t ns_port,
D2UpdateMessage& update,
const unsigned int wait) {
+ if (!io_service) {
+ isc_throw(isc::BadValue,
+ "DNSClient::doUpdate: IOService cannot be null");
+ }
+
// The underlying implementation which we use to send DNS Updates uses
// signed integers for timeout. If we want to avoid overflows we need to
// respect this limitation here.
diff --git a/src/bin/d2/dns_client.h b/src/bin/d2/dns_client.h
index c1c54f6..2727bbe 100644
--- a/src/bin/d2/dns_client.h
+++ b/src/bin/d2/dns_client.h
@@ -16,8 +16,8 @@
#define DNS_CLIENT_H
#include <d2/d2_update_message.h>
+#include <d2/d2_asio.h>
-#include <asiolink/io_service.h>
#include <util/buffer.h>
#include <asiodns/io_fetch.h>
@@ -151,7 +151,7 @@ public:
///
/// @todo Implement TSIG Support. Currently any attempt to call this
/// function will result in exception.
- void doUpdate(asiolink::IOService& io_service,
+ void doUpdate(IOServicePtr& io_service,
const asiolink::IOAddress& ns_addr,
const uint16_t ns_port,
D2UpdateMessage& update,
@@ -176,7 +176,7 @@ public:
/// @param wait A timeout (in seconds) for the response. If a response is
/// not received within the timeout, exchange is interrupted. This value
/// must not exceed maximal value for 'int' data type.
- void doUpdate(asiolink::IOService& io_service,
+ void doUpdate(IOServicePtr& io_service,
const asiolink::IOAddress& ns_addr,
const uint16_t ns_port,
D2UpdateMessage& update,
diff --git a/src/bin/d2/nc_trans.cc b/src/bin/d2/nc_trans.cc
index 50741fe..f691b62 100644
--- a/src/bin/d2/nc_trans.cc
+++ b/src/bin/d2/nc_trans.cc
@@ -39,7 +39,7 @@ const int NameChangeTransaction::UPDATE_FAILED_EVT;
const int NameChangeTransaction::NCT_DERIVED_EVENT_MIN;
NameChangeTransaction::
-NameChangeTransaction(isc::asiolink::IOService& io_service,
+NameChangeTransaction(IOServicePtr& io_service,
dhcp_ddns::NameChangeRequestPtr& ncr,
DdnsDomainPtr& forward_domain,
DdnsDomainPtr& reverse_domain)
@@ -48,8 +48,15 @@ NameChangeTransaction(isc::asiolink::IOService& io_service,
dns_update_status_(DNSClient::OTHER), dns_update_response_(),
forward_change_completed_(false), reverse_change_completed_(false),
current_server_list_(), current_server_(), next_server_pos_(0) {
+ // @todo if io_service is NULL we are multi-threading and should
+ // instantiate our own
+ if (!io_service_) {
+ isc_throw(NameChangeTransactionError, "IOServicePtr cannot be null");
+ }
+
if (!ncr_) {
- isc_throw(NameChangeTransactionError, "NameChangeRequest cannot null");
+ isc_throw(NameChangeTransactionError,
+ "NameChangeRequest cannot be null");
}
if (ncr_->isForwardChange() && !(forward_domain_)) {
diff --git a/src/bin/d2/nc_trans.h b/src/bin/d2/nc_trans.h
index d30dff7..ae9aa42 100644
--- a/src/bin/d2/nc_trans.h
+++ b/src/bin/d2/nc_trans.h
@@ -17,8 +17,8 @@
/// @file nc_trans.h This file defines the class NameChangeTransaction.
-#include <asiolink/io_service.h>
#include <exceptions/exceptions.h>
+#include <d2/d2_asio.h>
#include <d2/d2_config.h>
#include <d2/dns_client.h>
#include <d2/state_model.h>
@@ -163,7 +163,7 @@ public:
/// @throw NameChangeTransactionError if given an null request,
/// if forward change is enabled but forward domain is null, if
/// reverse change is enabled but reverse domain is null.
- NameChangeTransaction(isc::asiolink::IOService& io_service,
+ NameChangeTransaction(IOServicePtr& io_service,
dhcp_ddns::NameChangeRequestPtr& ncr,
DdnsDomainPtr& forward_domain,
DdnsDomainPtr& reverse_domain);
@@ -376,7 +376,7 @@ public:
private:
/// @brief The IOService which should be used to for IO processing.
- isc::asiolink::IOService& io_service_;
+ IOServicePtr io_service_;
/// @brief The NameChangeRequest that the transaction is to fulfill.
dhcp_ddns::NameChangeRequestPtr ncr_;
diff --git a/src/bin/d2/state_model.h b/src/bin/d2/state_model.h
index 1596bb6..9a7a1c9 100644
--- a/src/bin/d2/state_model.h
+++ b/src/bin/d2/state_model.h
@@ -17,7 +17,6 @@
/// @file state_model.h This file defines the class StateModel.
-#include <asiolink/io_service.h>
#include <exceptions/exceptions.h>
#include <d2/d2_config.h>
#include <d2/dns_client.h>
diff --git a/src/bin/d2/tests/Makefile.am b/src/bin/d2/tests/Makefile.am
index 0866ea0..2287197 100644
--- a/src/bin/d2/tests/Makefile.am
+++ b/src/bin/d2/tests/Makefile.am
@@ -51,7 +51,8 @@ if HAVE_GTEST
TESTS += d2_unittests
-d2_unittests_SOURCES = ../d2_log.h ../d2_log.cc
+d2_unittests_SOURCES = ../d2_asio.h
+d2_unittests_SOURCES += ../d2_log.h ../d2_log.cc
d2_unittests_SOURCES += ../d_process.h
d2_unittests_SOURCES += ../d_controller.cc ../d2_controller.h
d2_unittests_SOURCES += ../d2_process.cc ../d2_process.h
diff --git a/src/bin/d2/tests/d2_queue_mgr_unittests.cc b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
index 18bf95c..d3b1833 100644
--- a/src/bin/d2/tests/d2_queue_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_queue_mgr_unittests.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <asiolink/interval_timer.h>
+#include <d2/d2_asio.h>
#include <d2/d2_queue_mgr.h>
#include <dhcp_ddns/ncr_udp.h>
#include <util/time_utilities.h>
@@ -78,7 +78,7 @@ const long TEST_TIMEOUT = 5 * 1000;
/// @brief Tests that construction with max queue size of zero is not allowed.
TEST(D2QueueMgrBasicTest, construction1) {
- isc::asiolink::IOService io_service;
+ IOServicePtr io_service(new isc::asiolink::IOService());
// Verify that constructing with max queue size of zero is not allowed.
EXPECT_THROW(D2QueueMgr(io_service, 0), D2QueueMgrError);
@@ -86,7 +86,7 @@ TEST(D2QueueMgrBasicTest, construction1) {
/// @brief Tests default construction works.
TEST(D2QueueMgrBasicTest, construction2) {
- isc::asiolink::IOService io_service;
+ IOServicePtr io_service(new isc::asiolink::IOService());
// Verify that valid constructor works.
D2QueueMgrPtr queue_mgr;
@@ -97,7 +97,7 @@ TEST(D2QueueMgrBasicTest, construction2) {
/// @brief Tests construction with custom queue size works properly
TEST(D2QueueMgrBasicTest, construction3) {
- isc::asiolink::IOService io_service;
+ IOServicePtr io_service(new isc::asiolink::IOService());
// Verify that custom queue size constructor works.
D2QueueMgrPtr queue_mgr;
@@ -114,7 +114,7 @@ TEST(D2QueueMgrBasicTest, construction3) {
/// 4. Peek returns the first entry on the queue without altering queue content
/// 5. Dequeue removes the first entry on the queue
TEST(D2QueueMgrBasicTest, basicQueue) {
- isc::asiolink::IOService io_service;
+ IOServicePtr io_service(new isc::asiolink::IOService());
// Construct the manager with max queue size set to number of messages
// we'll use.
@@ -206,7 +206,7 @@ bool checkSendVsReceived(NameChangeRequestPtr sent_ncr,
class QueueMgrUDPTest : public virtual ::testing::Test,
NameChangeSender::RequestSendHandler {
public:
- isc::asiolink::IOService io_service_;
+ IOServicePtr io_service_;
NameChangeSenderPtr sender_;
isc::asiolink::IntervalTimer test_timer_;
D2QueueMgrPtr queue_mgr_;
@@ -215,7 +215,8 @@ public:
std::vector<NameChangeRequestPtr> sent_ncrs_;
std::vector<NameChangeRequestPtr> received_ncrs_;
- QueueMgrUDPTest() : io_service_(), test_timer_(io_service_) {
+ QueueMgrUDPTest() : io_service_(new isc::asiolink::IOService()),
+ test_timer_(*io_service_) {
isc::asiolink::IOAddress addr(TEST_ADDRESS);
// Create our sender instance. Note that reuse_address is true.
sender_.reset(new NameChangeUDPSender(addr, SENDER_PORT,
@@ -245,7 +246,7 @@ public:
///
/// This callback stops all running (hanging) tasks on IO service.
void testTimeoutHandler() {
- io_service_.stop();
+ io_service_->stop();
FAIL() << "Test timeout hit.";
}
};
@@ -296,7 +297,7 @@ TEST_F (QueueMgrUDPTest, stateModel) {
// Stopping requires IO cancel, which result in a callback.
// So process one event and verify we are STOPPED.
- io_service_.run_one();
+ io_service_->run_one();
EXPECT_EQ(D2QueueMgr::STOPPED, queue_mgr_->getMgrState());
// Verify that we can re-enter the RUNNING from STOPPED by starting the
@@ -313,7 +314,7 @@ TEST_F (QueueMgrUDPTest, stateModel) {
// Stopping requires IO cancel, which result in a callback.
// So process one event and verify we are STOPPED.
- io_service_.run_one();
+ io_service_->run_one();
EXPECT_EQ(D2QueueMgr::STOPPED, queue_mgr_->getMgrState());
// Verify that we can remove the listener in the STOPPED state and
@@ -355,7 +356,7 @@ TEST_F (QueueMgrUDPTest, liveFeed) {
ASSERT_EQ(D2QueueMgr::RUNNING, queue_mgr_->getMgrState());
// Place the sender into sending state.
- ASSERT_NO_THROW(sender_->startSending(io_service_));
+ ASSERT_NO_THROW(sender_->startSending(*io_service_));
ASSERT_TRUE(sender_->amSending());
// Iterate over the list of requests sending and receiving
@@ -366,8 +367,8 @@ TEST_F (QueueMgrUDPTest, liveFeed) {
ASSERT_NO_THROW(sender_->sendRequest(send_ncr));
// running two should do the send then the receive
- io_service_.run_one();
- io_service_.run_one();
+ io_service_->run_one();
+ io_service_->run_one();
// Verify that the request can be added to the queue and queue
// size increments accordingly.
@@ -390,8 +391,8 @@ TEST_F (QueueMgrUDPTest, liveFeed) {
ASSERT_NO_THROW(sender_->sendRequest(send_ncr));
// running two should do the send then the receive
- EXPECT_NO_THROW(io_service_.run_one());
- EXPECT_NO_THROW(io_service_.run_one());
+ EXPECT_NO_THROW(io_service_->run_one());
+ EXPECT_NO_THROW(io_service_->run_one());
EXPECT_EQ(i+1, queue_mgr_->getQueueSize());
}
@@ -400,11 +401,11 @@ TEST_F (QueueMgrUDPTest, liveFeed) {
// Send another. The send should succeed.
ASSERT_NO_THROW(sender_->sendRequest(send_ncr));
- EXPECT_NO_THROW(io_service_.run_one());
+ EXPECT_NO_THROW(io_service_->run_one());
// Now execute the receive which should not throw but should move us
// to STOPPED_QUEUE_FULL state.
- EXPECT_NO_THROW(io_service_.run_one());
+ EXPECT_NO_THROW(io_service_->run_one());
EXPECT_EQ(D2QueueMgr::STOPPED_QUEUE_FULL, queue_mgr_->getMgrState());
// Verify queue size did not increase beyond max.
@@ -430,10 +431,10 @@ TEST_F (QueueMgrUDPTest, liveFeed) {
// Verify that we can again receive requests.
// Send should be fine.
ASSERT_NO_THROW(sender_->sendRequest(send_ncr));
- EXPECT_NO_THROW(io_service_.run_one());
+ EXPECT_NO_THROW(io_service_->run_one());
// Receive should succeed.
- EXPECT_NO_THROW(io_service_.run_one());
+ EXPECT_NO_THROW(io_service_->run_one());
EXPECT_EQ(1, queue_mgr_->getQueueSize());
}
diff --git a/src/bin/d2/tests/d2_update_mgr_unittests.cc b/src/bin/d2/tests/d2_update_mgr_unittests.cc
index 0abed5d..af9f1f9 100644
--- a/src/bin/d2/tests/d2_update_mgr_unittests.cc
+++ b/src/bin/d2/tests/d2_update_mgr_unittests.cc
@@ -12,7 +12,7 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#include <asiolink/interval_timer.h>
+#include <d2/d2_asio.h>
#include <d2/d2_update_mgr.h>
#include <util/time_utilities.h>
#include <d_test_stubs.h>
@@ -41,7 +41,7 @@ public:
///
/// Parameters match those needed by D2UpdateMgr.
D2UpdateMgrWrapper(D2QueueMgrPtr& queue_mgr, D2CfgMgrPtr& cfg_mgr,
- isc::asiolink::IOService& io_service,
+ IOServicePtr& io_service,
const size_t max_transactions = MAX_TRANSACTIONS_DEFAULT)
: D2UpdateMgr(queue_mgr, cfg_mgr, io_service, max_transactions) {
}
@@ -68,7 +68,7 @@ typedef boost::shared_ptr<D2UpdateMgrWrapper> D2UpdateMgrWrapperPtr;
/// functions.
class D2UpdateMgrTest : public ConfigParseTest {
public:
- isc::asiolink::IOService io_service_;
+ IOServicePtr io_service_;
D2QueueMgrPtr queue_mgr_;
D2CfgMgrPtr cfg_mgr_;
//D2UpdateMgrPtr update_mgr_;
@@ -77,6 +77,7 @@ public:
size_t canned_count_;
D2UpdateMgrTest() {
+ io_service_.reset(new isc::asiolink::IOService());
queue_mgr_.reset(new D2QueueMgr(io_service_));
cfg_mgr_.reset(new D2CfgMgr());
update_mgr_.reset(new D2UpdateMgrWrapper(queue_mgr_, cfg_mgr_,
@@ -162,7 +163,7 @@ public:
/// 4. Default construction works and max transactions is defaulted properly
/// 5. Construction with custom max transactions works properly
TEST(D2UpdateMgr, construction) {
- isc::asiolink::IOService io_service;
+ IOServicePtr io_service(new isc::asiolink::IOService());
D2QueueMgrPtr queue_mgr;
D2CfgMgrPtr cfg_mgr;
D2UpdateMgrPtr update_mgr;
diff --git a/src/bin/d2/tests/d_test_stubs.h b/src/bin/d2/tests/d_test_stubs.h
index 1313687..7680a98 100644
--- a/src/bin/d2/tests/d_test_stubs.h
+++ b/src/bin/d2/tests/d_test_stubs.h
@@ -15,11 +15,11 @@
#ifndef D_TEST_STUBS_H
#define D_TEST_STUBS_H
-#include <asiolink/asiolink.h>
#include <cc/data.h>
#include <cc/session.h>
#include <config/ccsession.h>
+#include <d2/d2_asio.h>
#include <d2/d_controller.h>
#include <d2/d_cfg_mgr.h>
diff --git a/src/bin/d2/tests/dns_client_unittests.cc b/src/bin/d2/tests/dns_client_unittests.cc
index 9105ab8..e9fadd5 100644
--- a/src/bin/d2/tests/dns_client_unittests.cc
+++ b/src/bin/d2/tests/dns_client_unittests.cc
@@ -61,7 +61,7 @@ const long TEST_TIMEOUT = 5 * 1000;
// timeout is hit. This will result in test failure.
class DNSClientTest : public virtual ::testing::Test, DNSClient::Callback {
public:
- IOService service_;
+ IOServicePtr service_;
D2UpdateMessagePtr response_;
DNSClient::Status status_;
uint8_t receive_buffer_[MAX_SIZE];
@@ -79,11 +79,11 @@ public:
// in case when response from the server is not received. Tests output would
// become messy if such errors were logged.
DNSClientTest()
- : service_(),
+ : service_(new isc::asiolink::IOService()),
status_(DNSClient::SUCCESS),
corrupt_response_(false),
expect_response_(true),
- test_timer_(service_) {
+ test_timer_(*service_) {
asiodns::logger.setSeverity(isc::log::INFO);
response_.reset(new D2UpdateMessage(D2UpdateMessage::INBOUND));
dns_client_.reset(new DNSClient(response_, this));
@@ -108,7 +108,7 @@ public:
// @param status A status code returned by DNSClient.
virtual void operator()(DNSClient::Status status) {
status_ = status;
- service_.stop();
+ service_->stop();
if (expect_response_) {
if (!corrupt_response_) {
@@ -139,7 +139,7 @@ public:
//
// This callback stops all running (hanging) tasks on IO service.
void testTimeoutHandler() {
- service_.stop();
+ service_->stop();
FAIL() << "Test timeout hit.";
}
@@ -271,7 +271,7 @@ public:
// This starts the execution of tasks posted to IOService. run() blocks
// until stop() is called in the completion callback function.
- service_.run();
+ service_->run();
}
@@ -295,7 +295,7 @@ public:
// responses. The reuse address option is set so as both sockets can
// use the same address. This new socket is bound to the test address
// and port, where requests will be sent.
- udp::socket udp_socket(service_.get_io_service(), asio::ip::udp::v4());
+ udp::socket udp_socket(service_->get_io_service(), asio::ip::udp::v4());
udp_socket.set_option(socket_base::reuse_address(true));
udp_socket.bind(udp::endpoint(address::from_string(TEST_ADDRESS),
TEST_PORT));
@@ -334,7 +334,7 @@ public:
// Kick of the message exchange by actually running the scheduled
// "send" and "receive" operations.
- service_.run();
+ service_->run();
udp_socket.close();
diff --git a/src/bin/d2/tests/nc_trans_unittests.cc b/src/bin/d2/tests/nc_trans_unittests.cc
index 31785a4..24a9841 100644
--- a/src/bin/d2/tests/nc_trans_unittests.cc
+++ b/src/bin/d2/tests/nc_trans_unittests.cc
@@ -43,7 +43,7 @@ public:
/// @brief Constructor
///
/// Parameters match those needed by NameChangeTransaction.
- NameChangeStub(isc::asiolink::IOService& io_service,
+ NameChangeStub(IOServicePtr& io_service,
dhcp_ddns::NameChangeRequestPtr& ncr,
DdnsDomainPtr forward_domain,
DdnsDomainPtr reverse_domain)
@@ -210,10 +210,13 @@ typedef boost::shared_ptr<NameChangeStub> NameChangeStubPtr;
/// aspects of NameChangeTransaction.
class NameChangeTransactionTest : public ::testing::Test {
public:
- isc::asiolink::IOService io_service_;
+ IOServicePtr io_service_;
DdnsDomainPtr forward_domain_;
DdnsDomainPtr reverse_domain_;
+ NameChangeTransactionTest() : io_service_(new isc::asiolink::IOService()) {
+ }
+
virtual ~NameChangeTransactionTest() {
}
@@ -267,7 +270,7 @@ public:
/// requires reverse change.
/// 4. Valid construction functions properly
TEST(NameChangeTransaction, construction) {
- isc::asiolink::IOService io_service;
+ IOServicePtr io_service(new isc::asiolink::IOService());
const char* msg_str =
"{"
diff --git a/src/lib/dhcpsrv/tests/test_libraries.h b/src/lib/dhcpsrv/tests/test_libraries.h
deleted file mode 100644
index e39ecec..0000000
--- a/src/lib/dhcpsrv/tests/test_libraries.h
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (C) 2013 Internet Systems Consortium, Inc. ("ISC")
-//
-// Permission to use, copy, modify, and/or distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
-// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-// AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
-// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE
-// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-// PERFORMANCE OF THIS SOFTWARE.
-
-#ifndef TEST_LIBRARIES_H
-#define TEST_LIBRARIES_H
-
-#include <config.h>
-
-namespace {
-
-
-// Take care of differences in DLL naming between operating systems.
-
-#ifdef OS_OSX
-#define DLL_SUFFIX ".dylib"
-
-#else
-#define DLL_SUFFIX ".so"
-
-#endif
-
-
-// Names of the libraries used in these tests. These libraries are built using
-// libtool, so we need to look in the hidden ".libs" directory to locate the
-// shared library.
-
-// Library with load/unload functions creating marker files to check their
-// operation.
-static const char* CALLOUT_LIBRARY_1 = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libco1"
- DLL_SUFFIX;
-static const char* CALLOUT_LIBRARY_2 = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libco2"
- DLL_SUFFIX;
-
-// Name of a library which is not present.
-static const char* NOT_PRESENT_LIBRARY = "/Users/tmark/ddns/build/trac3156/bind10/src/lib/dhcpsrv/tests/.libs/libnothere"
- DLL_SUFFIX;
-} // anonymous namespace
-
-
-#endif // TEST_LIBRARIES_H
More information about the bind10-changes
mailing list