From b9c1b51e45b845debb76d8658edabca70ca56079 Mon Sep 17 00:00:00 2001 From: Kate Stone Date: Tue, 6 Sep 2016 20:57:50 +0000 Subject: *** This commit represents a complete reformatting of the LLDB source code *** to conform to clang-format’s LLVM style. This kind of mass change has *** two obvious implications: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Firstly, merging this particular commit into a downstream fork may be a huge effort. Alternatively, it may be worth merging all changes up to this commit, performing the same reformatting operation locally, and then discarding the merge for this particular commit. The commands used to accomplish this reformatting were as follows (with current working directory as the root of the repository): find . \( -iname "*.c" -or -iname "*.cpp" -or -iname "*.h" -or -iname "*.mm" \) -exec clang-format -i {} + find . -iname "*.py" -exec autopep8 --in-place --aggressive --aggressive {} + ; The version of clang-format used was 3.9.0, and autopep8 was 1.2.4. Secondly, “blame” style tools will generally point to this commit instead of a meaningful prior commit. There are alternatives available that will attempt to look through this change and find the appropriate prior commit. YMMV. llvm-svn: 280751 --- lldb/unittests/Host/SocketTest.cpp | 328 +++++++++++++++++++------------------ 1 file changed, 168 insertions(+), 160 deletions(-) (limited to 'lldb/unittests/Host/SocketTest.cpp') diff --git a/lldb/unittests/Host/SocketTest.cpp b/lldb/unittests/Host/SocketTest.cpp index e3e52274476..b7ecf190b59 100644 --- a/lldb/unittests/Host/SocketTest.cpp +++ b/lldb/unittests/Host/SocketTest.cpp @@ -8,7 +8,8 @@ //===----------------------------------------------------------------------===// #if defined(_MSC_VER) && (_HAS_EXCEPTIONS == 0) -// Workaround for MSVC standard library bug, which fails to include when +// Workaround for MSVC standard library bug, which fails to include +// when // exceptions are disabled. #include #endif @@ -30,182 +31,189 @@ using namespace lldb_private; -class SocketTest : public testing::Test -{ - public: - void - SetUp() override - { +class SocketTest : public testing::Test { +public: + void SetUp() override { #if defined(_MSC_VER) - WSADATA data; - ::WSAStartup(MAKEWORD(2, 2), &data); + WSADATA data; + ::WSAStartup(MAKEWORD(2, 2), &data); #endif - } + } - void - TearDown() override - { + void TearDown() override { #if defined(_MSC_VER) - ::WSACleanup(); + ::WSACleanup(); #endif - } - - protected: - static void - AcceptThread(Socket *listen_socket, const char *listen_remote_address, bool child_processes_inherit, - Socket **accept_socket, Error *error) - { - *error = listen_socket->Accept(listen_remote_address, child_processes_inherit, *accept_socket); - } - - template - void - CreateConnectedSockets(const char *listen_remote_address, const std::function &get_connect_addr, std::unique_ptr *a_up, std::unique_ptr *b_up) - { - bool child_processes_inherit = false; - Error error; - std::unique_ptr listen_socket_up(new SocketType(child_processes_inherit, error)); - EXPECT_FALSE(error.Fail()); - error = listen_socket_up->Listen(listen_remote_address, 5); - EXPECT_FALSE(error.Fail()); - EXPECT_TRUE(listen_socket_up->IsValid()); - - Error accept_error; - Socket *accept_socket; - std::thread accept_thread(AcceptThread, listen_socket_up.get(), listen_remote_address, child_processes_inherit, - &accept_socket, &accept_error); - - std::string connect_remote_address = get_connect_addr(*listen_socket_up); - std::unique_ptr connect_socket_up(new SocketType(child_processes_inherit, error)); - EXPECT_FALSE(error.Fail()); - error = connect_socket_up->Connect(connect_remote_address.c_str()); - EXPECT_FALSE(error.Fail()); - EXPECT_TRUE(connect_socket_up->IsValid()); - - a_up->swap(connect_socket_up); - EXPECT_TRUE(error.Success()); - EXPECT_NE(nullptr, a_up->get()); - EXPECT_TRUE((*a_up)->IsValid()); - - accept_thread.join(); - b_up->reset(static_cast(accept_socket)); - EXPECT_TRUE(accept_error.Success()); - EXPECT_NE(nullptr, b_up->get()); - EXPECT_TRUE((*b_up)->IsValid()); - - listen_socket_up.reset(); - } -}; - -TEST_F (SocketTest, DecodeHostAndPort) -{ - std::string host_str; - std::string port_str; - int32_t port; + } + +protected: + static void AcceptThread(Socket *listen_socket, + const char *listen_remote_address, + bool child_processes_inherit, Socket **accept_socket, + Error *error) { + *error = listen_socket->Accept(listen_remote_address, + child_processes_inherit, *accept_socket); + } + + template + void CreateConnectedSockets( + const char *listen_remote_address, + const std::function &get_connect_addr, + std::unique_ptr *a_up, std::unique_ptr *b_up) { + bool child_processes_inherit = false; Error error; - EXPECT_TRUE (Socket::DecodeHostAndPort ("localhost:1138", host_str, port_str, port, &error)); - EXPECT_STREQ ("localhost", host_str.c_str ()); - EXPECT_STREQ ("1138", port_str.c_str ()); - EXPECT_EQ (1138, port); - EXPECT_TRUE (error.Success ()); - - EXPECT_FALSE (Socket::DecodeHostAndPort ("google.com:65536", host_str, port_str, port, &error)); - EXPECT_TRUE (error.Fail ()); - EXPECT_STREQ ("invalid host:port specification: 'google.com:65536'", error.AsCString ()); - - EXPECT_FALSE (Socket::DecodeHostAndPort ("google.com:-1138", host_str, port_str, port, &error)); - EXPECT_TRUE (error.Fail ()); - EXPECT_STREQ ("invalid host:port specification: 'google.com:-1138'", error.AsCString ()); - - EXPECT_FALSE(Socket::DecodeHostAndPort("google.com:65536", host_str, port_str, port, &error)); - EXPECT_TRUE(error.Fail()); - EXPECT_STREQ("invalid host:port specification: 'google.com:65536'", error.AsCString()); - - EXPECT_TRUE (Socket::DecodeHostAndPort ("12345", host_str, port_str, port, &error)); - EXPECT_STREQ ("", host_str.c_str ()); - EXPECT_STREQ ("12345", port_str.c_str ()); - EXPECT_EQ (12345, port); - EXPECT_TRUE (error.Success ()); - - EXPECT_TRUE (Socket::DecodeHostAndPort ("*:0", host_str, port_str, port, &error)); - EXPECT_STREQ ("*", host_str.c_str ()); - EXPECT_STREQ ("0", port_str.c_str ()); - EXPECT_EQ (0, port); - EXPECT_TRUE (error.Success ()); - - EXPECT_TRUE(Socket::DecodeHostAndPort("*:65535", host_str, port_str, port, &error)); - EXPECT_STREQ("*", host_str.c_str()); - EXPECT_STREQ("65535", port_str.c_str()); - EXPECT_EQ(65535, port); + std::unique_ptr listen_socket_up( + new SocketType(child_processes_inherit, error)); + EXPECT_FALSE(error.Fail()); + error = listen_socket_up->Listen(listen_remote_address, 5); + EXPECT_FALSE(error.Fail()); + EXPECT_TRUE(listen_socket_up->IsValid()); + + Error accept_error; + Socket *accept_socket; + std::thread accept_thread(AcceptThread, listen_socket_up.get(), + listen_remote_address, child_processes_inherit, + &accept_socket, &accept_error); + + std::string connect_remote_address = get_connect_addr(*listen_socket_up); + std::unique_ptr connect_socket_up( + new SocketType(child_processes_inherit, error)); + EXPECT_FALSE(error.Fail()); + error = connect_socket_up->Connect(connect_remote_address.c_str()); + EXPECT_FALSE(error.Fail()); + EXPECT_TRUE(connect_socket_up->IsValid()); + + a_up->swap(connect_socket_up); EXPECT_TRUE(error.Success()); + EXPECT_NE(nullptr, a_up->get()); + EXPECT_TRUE((*a_up)->IsValid()); + + accept_thread.join(); + b_up->reset(static_cast(accept_socket)); + EXPECT_TRUE(accept_error.Success()); + EXPECT_NE(nullptr, b_up->get()); + EXPECT_TRUE((*b_up)->IsValid()); + + listen_socket_up.reset(); + } +}; + +TEST_F(SocketTest, DecodeHostAndPort) { + std::string host_str; + std::string port_str; + int32_t port; + Error error; + EXPECT_TRUE(Socket::DecodeHostAndPort("localhost:1138", host_str, port_str, + port, &error)); + EXPECT_STREQ("localhost", host_str.c_str()); + EXPECT_STREQ("1138", port_str.c_str()); + EXPECT_EQ(1138, port); + EXPECT_TRUE(error.Success()); + + EXPECT_FALSE(Socket::DecodeHostAndPort("google.com:65536", host_str, port_str, + port, &error)); + EXPECT_TRUE(error.Fail()); + EXPECT_STREQ("invalid host:port specification: 'google.com:65536'", + error.AsCString()); + + EXPECT_FALSE(Socket::DecodeHostAndPort("google.com:-1138", host_str, port_str, + port, &error)); + EXPECT_TRUE(error.Fail()); + EXPECT_STREQ("invalid host:port specification: 'google.com:-1138'", + error.AsCString()); + + EXPECT_FALSE(Socket::DecodeHostAndPort("google.com:65536", host_str, port_str, + port, &error)); + EXPECT_TRUE(error.Fail()); + EXPECT_STREQ("invalid host:port specification: 'google.com:65536'", + error.AsCString()); + + EXPECT_TRUE( + Socket::DecodeHostAndPort("12345", host_str, port_str, port, &error)); + EXPECT_STREQ("", host_str.c_str()); + EXPECT_STREQ("12345", port_str.c_str()); + EXPECT_EQ(12345, port); + EXPECT_TRUE(error.Success()); + + EXPECT_TRUE( + Socket::DecodeHostAndPort("*:0", host_str, port_str, port, &error)); + EXPECT_STREQ("*", host_str.c_str()); + EXPECT_STREQ("0", port_str.c_str()); + EXPECT_EQ(0, port); + EXPECT_TRUE(error.Success()); + + EXPECT_TRUE( + Socket::DecodeHostAndPort("*:65535", host_str, port_str, port, &error)); + EXPECT_STREQ("*", host_str.c_str()); + EXPECT_STREQ("65535", port_str.c_str()); + EXPECT_EQ(65535, port); + EXPECT_TRUE(error.Success()); } #ifndef LLDB_DISABLE_POSIX -TEST_F (SocketTest, DomainListenConnectAccept) -{ - char* file_name_str = tempnam(nullptr, nullptr); - EXPECT_NE (nullptr, file_name_str); - const std::string file_name(file_name_str); - free(file_name_str); - - std::unique_ptr socket_a_up; - std::unique_ptr socket_b_up; - CreateConnectedSockets(file_name.c_str(), - [=](const DomainSocket &) - { - return file_name; - }, - &socket_a_up, &socket_b_up); +TEST_F(SocketTest, DomainListenConnectAccept) { + char *file_name_str = tempnam(nullptr, nullptr); + EXPECT_NE(nullptr, file_name_str); + const std::string file_name(file_name_str); + free(file_name_str); + + std::unique_ptr socket_a_up; + std::unique_ptr socket_b_up; + CreateConnectedSockets( + file_name.c_str(), [=](const DomainSocket &) { return file_name; }, + &socket_a_up, &socket_b_up); } #endif -TEST_F (SocketTest, TCPListen0ConnectAccept) -{ - std::unique_ptr socket_a_up; - std::unique_ptr socket_b_up; - CreateConnectedSockets("127.0.0.1:0", - [=](const TCPSocket &s) - { - char connect_remote_address[64]; - snprintf(connect_remote_address, sizeof(connect_remote_address), "localhost:%u", s.GetLocalPortNumber()); - return std::string(connect_remote_address); - }, - &socket_a_up, &socket_b_up); +TEST_F(SocketTest, TCPListen0ConnectAccept) { + std::unique_ptr socket_a_up; + std::unique_ptr socket_b_up; + CreateConnectedSockets( + "127.0.0.1:0", + [=](const TCPSocket &s) { + char connect_remote_address[64]; + snprintf(connect_remote_address, sizeof(connect_remote_address), + "localhost:%u", s.GetLocalPortNumber()); + return std::string(connect_remote_address); + }, + &socket_a_up, &socket_b_up); } -TEST_F (SocketTest, TCPGetAddress) -{ - std::unique_ptr socket_a_up; - std::unique_ptr socket_b_up; - CreateConnectedSockets("127.0.0.1:0", - [=](const TCPSocket &s) - { - char connect_remote_address[64]; - snprintf(connect_remote_address, sizeof(connect_remote_address), "localhost:%u", s.GetLocalPortNumber()); - return std::string(connect_remote_address); - }, - &socket_a_up, - &socket_b_up); - - EXPECT_EQ (socket_a_up->GetLocalPortNumber (), socket_b_up->GetRemotePortNumber ()); - EXPECT_EQ (socket_b_up->GetLocalPortNumber (), socket_a_up->GetRemotePortNumber ()); - EXPECT_NE (socket_a_up->GetLocalPortNumber (), socket_b_up->GetLocalPortNumber ()); - EXPECT_STREQ ("127.0.0.1", socket_a_up->GetRemoteIPAddress ().c_str ()); - EXPECT_STREQ ("127.0.0.1", socket_b_up->GetRemoteIPAddress ().c_str ()); +TEST_F(SocketTest, TCPGetAddress) { + std::unique_ptr socket_a_up; + std::unique_ptr socket_b_up; + CreateConnectedSockets( + "127.0.0.1:0", + [=](const TCPSocket &s) { + char connect_remote_address[64]; + snprintf(connect_remote_address, sizeof(connect_remote_address), + "localhost:%u", s.GetLocalPortNumber()); + return std::string(connect_remote_address); + }, + &socket_a_up, &socket_b_up); + + EXPECT_EQ(socket_a_up->GetLocalPortNumber(), + socket_b_up->GetRemotePortNumber()); + EXPECT_EQ(socket_b_up->GetLocalPortNumber(), + socket_a_up->GetRemotePortNumber()); + EXPECT_NE(socket_a_up->GetLocalPortNumber(), + socket_b_up->GetLocalPortNumber()); + EXPECT_STREQ("127.0.0.1", socket_a_up->GetRemoteIPAddress().c_str()); + EXPECT_STREQ("127.0.0.1", socket_b_up->GetRemoteIPAddress().c_str()); } -TEST_F (SocketTest, UDPConnect) -{ - Socket* socket_a; - Socket* socket_b; +TEST_F(SocketTest, UDPConnect) { + Socket *socket_a; + Socket *socket_b; + + bool child_processes_inherit = false; + auto error = UDPSocket::Connect("127.0.0.1:0", child_processes_inherit, + socket_a, socket_b); - bool child_processes_inherit = false; - auto error = UDPSocket::Connect("127.0.0.1:0", child_processes_inherit, socket_a, socket_b); - - std::unique_ptr a_up(socket_a); - std::unique_ptr b_up(socket_b); + std::unique_ptr a_up(socket_a); + std::unique_ptr b_up(socket_b); - EXPECT_TRUE(error.Success ()); - EXPECT_TRUE(a_up->IsValid()); - EXPECT_TRUE(b_up->IsValid()); + EXPECT_TRUE(error.Success()); + EXPECT_TRUE(a_up->IsValid()); + EXPECT_TRUE(b_up->IsValid()); } -- cgit v1.2.3