[svn] commit: r2696 - in /branches/trac296/src/lib: cc/session.cc cc/session_unittests.cc python/isc/cc/session.py python/isc/cc/tests/session_test.py
BIND 10 source code commits
bind10-changes at lists.isc.org
Wed Aug 11 00:52:48 UTC 2010
Author: jinmei
Date: Wed Aug 11 00:52:46 2010
New Revision: 2696
Log:
minor editorial fixes:
- removed redundant white spaces in blank lines
- removed redundant C++ namespace (isc::cc)
- folded some too long lines
- constify some variables
- add UNUSED_PARAM for an unused variable (it compiles without it right now, but it'd be better to specify it for our internal code)
- removed a duplicate include (asio.hpp in session_unittests.cc)
- removed redundant space around '=' for default parameter spec (based on python coding guideline)
Modified:
branches/trac296/src/lib/cc/session.cc
branches/trac296/src/lib/cc/session_unittests.cc
branches/trac296/src/lib/python/isc/cc/session.py
branches/trac296/src/lib/python/isc/cc/tests/session_test.py
Modified: branches/trac296/src/lib/cc/session.cc
==============================================================================
--- branches/trac296/src/lib/cc/session.cc (original)
+++ branches/trac296/src/lib/cc/session.cc Wed Aug 11 00:52:46 2010
@@ -269,7 +269,7 @@
}
impl_->establish(*socket_file);
-
+
// once established, encapsulate the implementation object so that we
// can safely release the internal resource when exception happens
// below.
Modified: branches/trac296/src/lib/cc/session_unittests.cc
==============================================================================
--- branches/trac296/src/lib/cc/session_unittests.cc (original)
+++ branches/trac296/src/lib/cc/session_unittests.cc Wed Aug 11 00:52:46 2010
@@ -27,10 +27,9 @@
#include <cc/data.h>
#include <exceptions/exceptions.h>
-#include <asio.hpp>
#include <boost/bind.hpp>
-#include "session_unittests_config.h"
+#include <session_unittests_config.h>
using namespace isc::cc;
@@ -49,7 +48,7 @@
"/aaaaaaaaaa/aaaaaaaaaa/aaaaaaaaaa/aaaaaaaaaa/"
"/aaaaaaaaaa/aaaaaaaaaa/aaaaaaaaaa/aaaaaaaaaa/"
"/aaaaaaaaaa/aaaaaaaaaa/aaaaaaaaaa/aaaaaaaaaa/"
- ), isc::cc::SessionError
+ ), SessionError
);
}
@@ -60,10 +59,11 @@
class TestDomainSocket {
public:
- TestDomainSocket(asio::io_service& io_service, const char* file) : io_service_(io_service),
- ep_(file),
- acceptor_(io_service_, ep_),
- socket_(io_service_)
+ TestDomainSocket(asio::io_service& io_service, const char* file) :
+ io_service_(io_service),
+ ep_(file),
+ acceptor_(io_service_, ep_),
+ socket_(io_service_)
{
acceptor_.async_accept(socket_,
boost::bind(&TestDomainSocket::acceptHandler,
@@ -76,35 +76,40 @@
}
void
- acceptHandler(const asio::error_code& error) {
+ acceptHandler(const asio::error_code& error UNUSED_PARAM) {
}
void
sendmsg(isc::data::ElementPtr& env, isc::data::ElementPtr& msg) {
- std::string header_wire = env->toWire();
- std::string body_wire = msg->toWire();
- unsigned int length = 2 + header_wire.length() + body_wire.length();
- unsigned int length_net = htonl(length);
- unsigned short header_length = header_wire.length();
- unsigned short header_length_net = htons(header_length);
+ const std::string header_wire = env->toWire();
+ const std::string body_wire = msg->toWire();
+ const unsigned int length = 2 + header_wire.length() +
+ body_wire.length();
+ const unsigned int length_net = htonl(length);
+ const unsigned short header_length = header_wire.length();
+ const unsigned short header_length_net = htons(header_length);
socket_.send(asio::buffer(&length_net, sizeof(length_net)));
- socket_.send(asio::buffer(&header_length_net, sizeof(header_length_net)));
+ socket_.send(asio::buffer(&header_length_net,
+ sizeof(header_length_net)));
socket_.send(asio::buffer(header_wire.data(), header_length));
socket_.send(asio::buffer(body_wire.data(), body_wire.length()));
}
void
sendLname() {
- isc::data::ElementPtr lname_answer1 = isc::data::Element::fromJSON("{ \"type\": \"lname\" }");
- isc::data::ElementPtr lname_answer2 = isc::data::Element::fromJSON("{ \"lname\": \"foobar\" }");
+ isc::data::ElementPtr lname_answer1 =
+ isc::data::Element::fromJSON("{ \"type\": \"lname\" }");
+ isc::data::ElementPtr lname_answer2 =
+ isc::data::Element::fromJSON("{ \"lname\": \"foobar\" }");
sendmsg(lname_answer1, lname_answer2);
}
void
setSendLname() {
// ignore whatever data we get, send back an lname
- asio::async_read(socket_, asio::buffer(data_buf, 1024), boost::bind(&TestDomainSocket::sendLname, this));
+ asio::async_read(socket_, asio::buffer(data_buf, 1024),
+ boost::bind(&TestDomainSocket::sendLname, this));
}
private:
@@ -126,7 +131,7 @@
sess.setTimeout(100);
EXPECT_EQ(100, sess.getTimeout());
// no answer, should timeout
- EXPECT_THROW(sess.establish(BIND10_TEST_SOCKET_FILE), isc::cc::SessionTimeout);
+ EXPECT_THROW(sess.establish(BIND10_TEST_SOCKET_FILE), SessionTimeout);
}
TEST(Session, connect_ok) {
@@ -154,6 +159,6 @@
}
isc::data::ElementPtr env, msg;
- EXPECT_THROW(sess.group_recvmsg(env, msg, false, -1), isc::cc::SessionError);
+ EXPECT_THROW(sess.group_recvmsg(env, msg, false, -1), SessionError);
}
Modified: branches/trac296/src/lib/python/isc/cc/session.py
==============================================================================
--- branches/trac296/src/lib/python/isc/cc/session.py (original)
+++ branches/trac296/src/lib/python/isc/cc/session.py Wed Aug 11 00:52:46 2010
@@ -40,7 +40,7 @@
self._closed = False
self._queue = []
self._lock = threading.RLock()
-
+
if socket_file is None:
if "BIND10_MSGQ_SOCKET_FILE" in os.environ:
self.socket_file = os.environ["BIND10_MSGQ_SOCKET_FILE"]
@@ -48,7 +48,6 @@
self.socket_file = bind10_config.BIND10_MSGQ_SOCKET_FILE
else:
self.socket_file = socket_file
-
try:
self._socket = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
Modified: branches/trac296/src/lib/python/isc/cc/tests/session_test.py
==============================================================================
--- branches/trac296/src/lib/python/isc/cc/tests/session_test.py (original)
+++ branches/trac296/src/lib/python/isc/cc/tests/session_test.py Wed Aug 11 00:52:46 2010
@@ -100,7 +100,7 @@
# to override the __init__() method, which wants a socket,
# and we need to use our fake socket
class MySession(Session):
- def __init__(self, port=9912, s = None):
+ def __init__(self, port=9912, s=None):
self._socket = None
self._socket_timeout = 1
self._lname = None
More information about the bind10-changes
mailing list