commit e98628cecbe1d1731a5b0181a0d2723621cb297c
author Oleksiy Vyalov <ovyalov@google.com> Thu Oct 15 23:54:09 2015 +0000
committer Oleksiy Vyalov <ovyalov@google.com> Thu Oct 15 23:54:09 2015 +0000
tree dac18f72df0ba71eb7d77b64d35ed3733511095b
parent 15709991d09d940834029baf20a078d44f55234a

Split Socket class into Tcp/Udp/DomainSocket subclasses.

http://reviews.llvm.org/D13754

llvm-svn: 250474

lldb/tools/lldb-server/lldb-platform.cpp

diff --git a/lldb/tools/lldb-server/lldb-platform.cpp b/lldb/tools/lldb-server/lldb-platform.cpp
index 4dfa7d2..df9b6bb 100644
--- a/lldb/tools/lldb-server/lldb-platform.cpp
+++ b/lldb/tools/lldb-server/lldb-platform.cpp
@@ -29,7 +29,7 @@
 #include "lldb/Host/FileSystem.h"
 #include "lldb/Host/HostGetOpt.h"
 #include "lldb/Host/OptionParser.h"
-#include "lldb/Host/Socket.h"
+#include "lldb/Host/common/TCPSocket.h"
 #include "llvm/Support/FileSystem.h"
 #include "llvm/Support/FileUtilities.h"
 #include "LLDBServerUtilities.h"
@@ -283,7 +283,6 @@
         exit(option_error);
     }
     
-    std::unique_ptr<Socket> listening_socket_up;
     Socket *socket = nullptr;
     const bool children_inherit_listen_socket = false;
 
@@ -291,14 +290,19 @@
     // The highest this should get reasonably is a function of the number 
     // of target CPUs.  For now, let's just use 100
     const int backlog = 100;
-    error = Socket::TcpListen(listen_host_port.c_str(), children_inherit_listen_socket, socket, NULL, backlog);
+    std::unique_ptr<TCPSocket> listening_socket_up(new TCPSocket(children_inherit_listen_socket, error));
+    if (error.Fail())
+    {
+        fprintf(stderr, "failed to create socket: %s", error.AsCString());
+        exit(socket_error);
+    }
+
+    error = listening_socket_up->Listen(listen_host_port.c_str(), backlog);
     if (error.Fail())
     {
         printf("error: %s\n", error.AsCString());
         exit(socket_error);
     }
-    listening_socket_up.reset(socket);
-    printf ("Listening for a connection from %u...\n", listening_socket_up->GetLocalPortNumber());
     if (port_file)
     {
         error = save_port_to_file(listening_socket_up->GetLocalPortNumber(), port_file);
@@ -322,7 +326,7 @@
 
         const bool children_inherit_accept_socket = true;
         socket = nullptr;
-        error = listening_socket_up->BlockingAccept(listen_host_port.c_str(), children_inherit_accept_socket, socket);
+        error = listening_socket_up->Accept(listen_host_port.c_str(), children_inherit_accept_socket, socket);
         if (error.Fail())
         {
             printf ("error: %s\n", error.AsCString());