BIND 10 trac554, updated. bc3d1d70a2a074f3c3360ed75ea87a7fe81a4da6 [trac554] Changed UDPQuery to IOFetch everywhere
BIND 10 source code commits
bind10-changes at lists.isc.org
Tue Feb 1 20:40:52 UTC 2011
The branch, trac554 has been updated
via bc3d1d70a2a074f3c3360ed75ea87a7fe81a4da6 (commit)
from 709abc271e802e1a27b6f74fe54f7f5da5a7161e (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 bc3d1d70a2a074f3c3360ed75ea87a7fe81a4da6
Author: Scott Mann <smann at isc.org>
Date: Tue Feb 1 13:39:53 2011 -0700
[trac554] Changed UDPQuery to IOFetch everywhere
-----------------------------------------------------------------------
Summary of changes:
src/lib/asiolink/README | 2 +-
src/lib/asiolink/asiolink.cc | 12 +++---
src/lib/asiolink/internal/iofetch.h | 16 ++++----
src/lib/asiolink/internal/tests/udpdns_unittest.cc | 38 ++++++++++----------
src/lib/asiolink/iofetch.cc | 14 ++++----
5 files changed, 41 insertions(+), 41 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/lib/asiolink/README b/src/lib/asiolink/README
index b0f6a7d..b298f9f 100644
--- a/src/lib/asiolink/README
+++ b/src/lib/asiolink/README
@@ -33,7 +33,7 @@ This is intended to simplify development a bit, since it allows the
routines to be written in a straightfowrard step-step-step fashion rather
than as a complex chain of separate handler functions.
-Coroutine objects (i.e., UDPServer, TCPServer and UDPQuery) are objects
+Coroutine objects (i.e., UDPServer, TCPServer and IOFetch) are objects
with reenterable operator() members. When an instance of one of these
classes is called as a function, it resumes at the position where it left
off. Thus, a UDPServer can issue an asynchronous I/O call and specify
diff --git a/src/lib/asiolink/asiolink.cc b/src/lib/asiolink/asiolink.cc
index 2089acf..647daf9 100644
--- a/src/lib/asiolink/asiolink.cc
+++ b/src/lib/asiolink/asiolink.cc
@@ -339,7 +339,7 @@ namespace {
*
* Used by RecursiveQuery::sendQuery.
*/
-class RunningQuery : public UDPQuery::Callback {
+class RunningQuery : public IOFetch::Callback {
private:
// The io service to handle async calls
asio::io_service& io_;
@@ -399,7 +399,7 @@ private:
int serverIndex = rand() % uc;
dlog("Sending upstream query (" + question_.toText() +
") to " + upstream_->at(serverIndex).first);
- UDPQuery query(io_, question_,
+ IOFetch query(io_, question_,
upstream_->at(serverIndex).first,
upstream_->at(serverIndex).second, buffer_, this,
query_timeout_);
@@ -409,7 +409,7 @@ private:
int serverIndex = rand() % zs;
dlog("Sending query to zone server (" + question_.toText() +
") to " + zone_servers_.at(serverIndex).first);
- UDPQuery query(io_, question_,
+ IOFetch query(io_, question_,
zone_servers_.at(serverIndex).first,
zone_servers_.at(serverIndex).second, buffer_, this,
query_timeout_);
@@ -572,10 +572,10 @@ public:
}
// This function is used as callback from DNSQuery.
- virtual void operator()(UDPQuery::Result result) {
+ virtual void operator()(IOFetch::Result result) {
// XXX is this the place for TCP retry?
--queries_out_;
- if (!done_ && result != UDPQuery::TIME_OUT) {
+ if (!done_ && result != IOFetch::TIME_OUT) {
// we got an answer
Message incoming(Message::PARSE);
InputBuffer ibuf(buffer_->getData(), buffer_->getLength());
@@ -590,7 +590,7 @@ public:
}
if (done_) {
- stop(result == UDPQuery::SUCCESS);
+ stop(result == IOFetch::SUCCESS);
}
} else if (!done_ && retries_--) {
// We timed out, but we have some retries, so send again
diff --git a/src/lib/asiolink/internal/iofetch.h b/src/lib/asiolink/internal/iofetch.h
index 7c0a8a0..29c6af4 100644
--- a/src/lib/asiolink/internal/iofetch.h
+++ b/src/lib/asiolink/internal/iofetch.h
@@ -12,8 +12,8 @@
// OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
-#ifndef __IOQUERY_H
-#define __IOQUERY_H 1
+#ifndef __IOFETCH_H
+#define __IOFETCH_H 1
#include <config.h>
@@ -36,9 +36,9 @@ namespace asiolink {
//
// Asynchronous UDP coroutine for upstream queries
//
-class UDPQuery : public coroutine {
+class IOFetch : public coroutine {
public:
- // TODO Maybe this should be more generic than just for UDPQuery?
+ // TODO Maybe this should be more generic than just for IOFetch?
///
/// \brief Result of the query
///
@@ -50,12 +50,12 @@ public:
TIME_OUT,
STOPPED
};
- /// Abstract callback for the UDPQuery.
+ /// Abstract callback for the IOFetch.
class Callback {
public:
virtual ~Callback() {}
- /// This will be called when the UDPQuery is completed
+ /// This will be called when the IOFetch is completed
virtual void operator()(Result result) = 0;
};
///
@@ -66,7 +66,7 @@ public:
/// delete it if allocated on heap.
///@param timeout in ms.
///
- explicit UDPQuery(asio::io_service& io_service,
+ explicit IOFetch(asio::io_service& io_service,
const isc::dns::Question& q,
const IOAddress& addr, uint16_t port,
isc::dns::OutputBufferPtr buffer,
@@ -93,7 +93,7 @@ private:
}
-#endif // __IOQUERY_H
+#endif // __IOFETCH_H
// Local Variables:
// mode: c++
diff --git a/src/lib/asiolink/internal/tests/udpdns_unittest.cc b/src/lib/asiolink/internal/tests/udpdns_unittest.cc
index 1e36e4a..b22670f 100644
--- a/src/lib/asiolink/internal/tests/udpdns_unittest.cc
+++ b/src/lib/asiolink/internal/tests/udpdns_unittest.cc
@@ -33,25 +33,25 @@ const uint16_t TEST_PORT(5301);
// FIXME Shouldn't we send something that is real message?
const char TEST_DATA[] = "TEST DATA";
-// Test fixture for the asiolink::UDPQuery.
-class UDPQueryTest : public ::testing::Test,
- public asiolink::UDPQuery::Callback
+// Test fixture for the asiolink::IOFetch.
+class IOFetchTest : public ::testing::Test,
+ public asiolink::IOFetch::Callback
{
public:
// Expected result of the callback
- asiolink::UDPQuery::Result expected_;
+ asiolink::IOFetch::Result expected_;
// Did the callback run already?
bool run_;
// We use an io_service to run the query
io_service service_;
// Something to ask
Question question_;
- // Buffer where the UDPQuery will store response
+ // Buffer where the IOFetch will store response
OutputBufferPtr buffer_;
// The query we are testing
- asiolink::UDPQuery query_;
+ asiolink::IOFetch query_;
- UDPQueryTest() :
+ IOFetchTest() :
run_(false),
question_(Name("example.net"), RRClass::IN(), RRType::A()),
buffer_(new OutputBuffer(512)),
@@ -60,7 +60,7 @@ class UDPQueryTest : public ::testing::Test,
{ }
// This is the callback's (), so it can be called.
- void operator()(asiolink::UDPQuery::Result result) {
+ void operator()(asiolink::IOFetch::Result result) {
// We check the query returns the correct result
EXPECT_EQ(expected_, result);
// Check it is called only once
@@ -84,14 +84,14 @@ class UDPQueryTest : public ::testing::Test,
* That is why stop() is posted to the service_ as well instead
* of calling it.
*/
-TEST_F(UDPQueryTest, stop) {
- expected_ = asiolink::UDPQuery::STOPPED;
+TEST_F(IOFetchTest, stop) {
+ expected_ = asiolink::IOFetch::STOPPED;
// Post the query
service_.post(query_);
// Post query_.stop() (yes, the boost::bind thing is just
// query_.stop()).
- service_.post(boost::bind(&asiolink::UDPQuery::stop, query_,
- asiolink::UDPQuery::STOPPED));
+ service_.post(boost::bind(&asiolink::IOFetch::stop, query_,
+ asiolink::IOFetch::STOPPED));
// Run both of them
service_.run();
EXPECT_TRUE(run_);
@@ -102,8 +102,8 @@ TEST_F(UDPQueryTest, stop) {
* before it gets executed, it acts sanely as well (eg. has the
* same result as running stop() after - calls the callback).
*/
-TEST_F(UDPQueryTest, prematureStop) {
- expected_ = asiolink::UDPQuery::STOPPED;
+TEST_F(IOFetchTest, prematureStop) {
+ expected_ = asiolink::IOFetch::STOPPED;
// Stop before it is started
query_.stop();
service_.post(query_);
@@ -114,8 +114,8 @@ TEST_F(UDPQueryTest, prematureStop) {
/*
* Test that it will timeout when no answer will arrive.
*/
-TEST_F(UDPQueryTest, timeout) {
- expected_ = asiolink::UDPQuery::TIME_OUT;
+TEST_F(IOFetchTest, timeout) {
+ expected_ = asiolink::IOFetch::TIME_OUT;
service_.post(query_);
service_.run();
EXPECT_TRUE(run_);
@@ -127,15 +127,15 @@ TEST_F(UDPQueryTest, timeout) {
*
* This is done through a real socket on loopback address.
*/
-TEST_F(UDPQueryTest, receive) {
- expected_ = asiolink::UDPQuery::SUCCESS;
+TEST_F(IOFetchTest, receive) {
+ expected_ = asiolink::IOFetch::SUCCESS;
udp::socket socket(service_, udp::v4());
socket.set_option(socket_base::reuse_address(true));
socket.bind(udp::endpoint(TEST_HOST, TEST_PORT));
char inbuff[512];
udp::endpoint remote;
socket.async_receive_from(asio::buffer(inbuff, 512), remote, boost::bind(
- &UDPQueryTest::respond, this, &remote, &socket));
+ &IOFetchTest::respond, this, &remote, &socket));
service_.post(query_);
service_.run();
EXPECT_TRUE(run_);
diff --git a/src/lib/asiolink/iofetch.cc b/src/lib/asiolink/iofetch.cc
index 668a980..21fbcdf 100644
--- a/src/lib/asiolink/iofetch.cc
+++ b/src/lib/asiolink/iofetch.cc
@@ -50,8 +50,8 @@ using namespace isc::dns;
namespace asiolink {
-// Private UDPQuery data (see internal/udpdns.h for reasons)
-struct UDPQuery::PrivateData {
+// Private IOFetch data (see internal/udpdns.h for reasons)
+struct IOFetch::PrivateData {
// UDP Socket we send query to and expect reply from there
udp::socket socket;
// Where was the query sent
@@ -91,10 +91,10 @@ struct UDPQuery::PrivateData {
{ }
};
-/// The following functions implement the \c UDPQuery class.
+/// The following functions implement the \c IOFetch class.
///
/// The constructor
-UDPQuery::UDPQuery(io_service& io_service,
+IOFetch::IOFetch(io_service& io_service,
const Question& q, const IOAddress& addr, uint16_t port,
OutputBufferPtr buffer, Callback *callback, int timeout) :
data_(new PrivateData(io_service,
@@ -108,7 +108,7 @@ UDPQuery::UDPQuery(io_service& io_service,
/// The function operator is implemented with the "stackless coroutine"
/// pattern; see internal/coroutine.h for details.
void
-UDPQuery::operator()(error_code ec, size_t length) {
+IOFetch::operator()(error_code ec, size_t length) {
if (ec || data_->stopped) {
return;
}
@@ -138,7 +138,7 @@ UDPQuery::operator()(error_code ec, size_t length) {
if (data_->timeout != -1) {
data_->timer.expires_from_now(boost::posix_time::milliseconds(
data_->timeout));
- data_->timer.async_wait(boost::bind(&UDPQuery::stop, *this,
+ data_->timer.async_wait(boost::bind(&IOFetch::stop, *this,
TIME_OUT));
}
@@ -171,7 +171,7 @@ UDPQuery::operator()(error_code ec, size_t length) {
}
void
-UDPQuery::stop(Result result) {
+IOFetch::stop(Result result) {
if (!data_->stopped) {
switch (result) {
case TIME_OUT:
More information about the bind10-changes
mailing list