You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by dm...@apache.org on 2014/12/05 22:46:20 UTC
[5/5] mesos git commit: Fix some style and naming issues
Fix some style and naming issues
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/83d90df1
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/83d90df1
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/83d90df1
Branch: refs/heads/master
Commit: 83d90df125f05ab3c4f1b31311f7e5f1c9d6f8c1
Parents: 0503b67
Author: Dominic Hamon <dh...@twitter.com>
Authored: Fri Dec 5 13:33:59 2014 -0800
Committer: Dominic Hamon <dh...@twitter.com>
Committed: Fri Dec 5 13:33:59 2014 -0800
----------------------------------------------------------------------
3rdparty/libprocess/include/process/socket.hpp | 26 +++++++++++---------
3rdparty/libprocess/src/http.cpp | 6 ++---
3rdparty/libprocess/src/process.cpp | 20 +++++++--------
3rdparty/libprocess/src/tests/http_tests.cpp | 6 ++---
3rdparty/libprocess/src/tests/process_tests.cpp | 18 +++++++-------
5 files changed, 40 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/83d90df1/3rdparty/libprocess/include/process/socket.hpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/include/process/socket.hpp b/3rdparty/libprocess/include/process/socket.hpp
index 9188e3d..916576f 100644
--- a/3rdparty/libprocess/include/process/socket.hpp
+++ b/3rdparty/libprocess/include/process/socket.hpp
@@ -46,11 +46,12 @@ inline Try<int> accept(int s, sa_family_t family)
sockaddr_in addr = net::createSockaddrIn(0, 0);
socklen_t addrlen = sizeof(addr);
- int rc = ::accept(s, (sockaddr*) &addr, &addrlen);
- if (rc < 0)
- return ErrnoError("Failed to accept");
+ int accepted = ::accept(s, (sockaddr*) &addr, &addrlen);
+ if (accepted < 0) {
+ return ErrnoError("Failed to accept");
+ }
- return rc;
+ return accepted;
}
default:
return Error("Unsupported family type: " + stringify(family));
@@ -61,22 +62,24 @@ inline Try<int> bind(int s, const Node& node)
{
sockaddr_in addr = net::createSockaddrIn(node.ip, node.port);
- int rc = ::bind(s, (sockaddr*) &addr, sizeof(addr));
- if (rc < 0)
+ int bound = ::bind(s, (sockaddr*) &addr, sizeof(addr));
+ if (bound < 0) {
return ErrnoError("Failed to bind on " + stringify(node));
+ }
- return rc;
+ return bound;
}
inline Try<int> connect(int s, const Node& node)
{
sockaddr_in addr = net::createSockaddrIn(node.ip, node.port);
- int rc = ::connect(s, (sockaddr*) &addr, sizeof(addr));
- if (rc < 0)
+ int connected = ::connect(s, (sockaddr*) &addr, sizeof(addr));
+ if (connected < 0) {
return ErrnoError("Failed to connect to " + stringify(node));
+ }
- return rc;
+ return connected;
}
inline Try<Node> getsockname(int s, sa_family_t family)
@@ -86,8 +89,9 @@ inline Try<Node> getsockname(int s, sa_family_t family)
sockaddr_in addr = net::createSockaddrIn(0, 0);
socklen_t addrlen = sizeof(addr);
- if(::getsockname(s, (sockaddr*) &addr, &addrlen) < 0)
+ if(::getsockname(s, (sockaddr*) &addr, &addrlen) < 0) {
return ErrnoError("Failed to getsockname");
+ }
return Node(addr.sin_addr.s_addr, ntohs(addr.sin_port));
}
http://git-wip-us.apache.org/repos/asf/mesos/blob/83d90df1/3rdparty/libprocess/src/http.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/http.cpp b/3rdparty/libprocess/src/http.cpp
index 789be4a..465e447 100644
--- a/3rdparty/libprocess/src/http.cpp
+++ b/3rdparty/libprocess/src/http.cpp
@@ -82,10 +82,10 @@ Future<Response> request(
const string host = stringify(upid.node);
- Try<int> tryConnect = process::connect(s, upid.node);
- if (tryConnect.isError()) {
+ Try<int> connected = process::connect(s, upid.node);
+ if (connected.isError()) {
os::close(s);
- return Failure(tryConnect.error());
+ return Failure(connected.error());
}
std::ostringstream out;
http://git-wip-us.apache.org/repos/asf/mesos/blob/83d90df1/3rdparty/libprocess/src/process.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/process.cpp b/3rdparty/libprocess/src/process.cpp
index c0d80bf..b87ac22 100644
--- a/3rdparty/libprocess/src/process.cpp
+++ b/3rdparty/libprocess/src/process.cpp
@@ -1271,14 +1271,14 @@ Future<Nothing> connect(const Socket& socket)
Future<Nothing> Socket::Impl::connect(const Node& node)
{
- Try<int> tryConnect = process::connect(get(), node);
- if (tryConnect.isError()) {
+ Try<int> connected = process::connect(get(), node);
+ if (connected.isError()) {
if (errno == EINPROGRESS) {
return io::poll(get(), io::WRITE)
.then(lambda::bind(&internal::connect, Socket(shared_from_this())));
}
- return Failure(tryConnect.error());
+ return Failure(connected.error());
}
return Nothing();
@@ -1383,9 +1383,9 @@ Future<size_t> Socket::Impl::sendfile(int fd, off_t offset, size_t size)
Try<Node> Socket::Impl::bind(const Node& node)
{
- Try<int> tryBind = process::bind(get(), node);
- if (tryBind.isError()) {
- return Error(tryBind.error());
+ Try<int> bound = process::bind(get(), node);
+ if (bound.isError()) {
+ return Error(bound.error());
}
// Lookup and store assigned ip and assigned port.
@@ -1406,12 +1406,12 @@ namespace internal {
Future<Socket> accept(int fd)
{
- Try<int> tryAccept = process::accept(fd, AF_INET);
- if (tryAccept.isError()) {
- return Failure(tryAccept.error());
+ Try<int> accepted = process::accept(fd, AF_INET);
+ if (accepted.isError()) {
+ return Failure(accepted.error());
}
- int s = tryAccept.get();
+ int s = accepted.get();
Try<Nothing> nonblock = os::nonblock(s);
if (nonblock.isError()) {
LOG_IF(INFO, VLOG_IS_ON(1)) << "Failed to accept, nonblock: "
http://git-wip-us.apache.org/repos/asf/mesos/blob/83d90df1/3rdparty/libprocess/src/tests/http_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/http_tests.cpp b/3rdparty/libprocess/src/tests/http_tests.cpp
index 7286682..3bda76d 100644
--- a/3rdparty/libprocess/src/tests/http_tests.cpp
+++ b/3rdparty/libprocess/src/tests/http_tests.cpp
@@ -114,11 +114,11 @@ TEST(HTTP, Endpoints)
spawn(process);
// First hit '/body' (using explicit sockets and HTTP/1.0).
- Try<int> trySocket = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ Try<int> sock = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
- ASSERT_TRUE(trySocket.isSome());
+ ASSERT_TRUE(sock.isSome());
- int s = trySocket.get();
+ int s = sock.get();
ASSERT_TRUE(process::connect(s, process.self().node).isSome());
http://git-wip-us.apache.org/repos/asf/mesos/blob/83d90df1/3rdparty/libprocess/src/tests/process_tests.cpp
----------------------------------------------------------------------
diff --git a/3rdparty/libprocess/src/tests/process_tests.cpp b/3rdparty/libprocess/src/tests/process_tests.cpp
index 03917c4..45be2e1 100644
--- a/3rdparty/libprocess/src/tests/process_tests.cpp
+++ b/3rdparty/libprocess/src/tests/process_tests.cpp
@@ -1419,11 +1419,11 @@ TEST(Process, remote)
EXPECT_CALL(process, handler(_, _))
.WillOnce(FutureSatisfy(&handler));
- Try<int> trySocket = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ Try<int> sock = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
- ASSERT_TRUE(trySocket.isSome());
+ ASSERT_TRUE(sock.isSome());
- int s = trySocket.get();
+ int s = sock.get();
ASSERT_TRUE(process::connect(s, process.self().node).isSome());
@@ -1485,10 +1485,10 @@ TEST(Process, http2)
spawn(process);
// Create a receiving socket so we can get messages back.
- Try<int> trySocket = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
- ASSERT_TRUE(trySocket.isSome());
+ Try<int> sock = process::socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
+ ASSERT_TRUE(sock.isSome());
- int s = trySocket.get();
+ int s = sock.get();
ASSERT_TRUE(process::bind(s, Node()).isSome());
@@ -1527,10 +1527,10 @@ TEST(Process, http2)
post(process.self(), from, name);
// Accept the incoming connection.
- Try<int> tryAccept = process::accept(s, AF_INET);
- ASSERT_TRUE(tryAccept.isSome());
+ Try<int> accepted = process::accept(s, AF_INET);
+ ASSERT_TRUE(accepted.isSome());
- int c = tryAccept.get();
+ int c = accepted.get();
ASSERT_LT(0, c);
const string data = "POST /" + name + " HTTP/1.1";