ovyalov retitled this revision from "Make Socket to support plugin interface"
to "Add Socket::Create factory method which uses socket scheme (tcp, unix,..)
to find an appropriate implementation class.".
ovyalov updated the summary for this revision.
ovyalov updated this revision to Diff 38484.
http://reviews.llvm.org/D14085
Files:
include/lldb/Host/Socket.h
include/lldb/Host/common/TCPSocket.h
include/lldb/Host/common/UDPSocket.h
include/lldb/Host/linux/AbstractSocket.h
include/lldb/Host/posix/DomainSocket.h
source/Host/common/Socket.cpp
source/Host/common/TCPSocket.cpp
source/Host/common/UDPSocket.cpp
source/Host/linux/AbstractSocket.cpp
source/Host/posix/DomainSocket.cpp
tools/lldb-server/Acceptor.cpp
Index: tools/lldb-server/Acceptor.cpp
===================================================================
--- tools/lldb-server/Acceptor.cpp
+++ tools/lldb-server/Acceptor.cpp
@@ -14,7 +14,8 @@
#include "lldb/Core/StreamString.h"
#include "lldb/Host/ConnectionFileDescriptor.h"
#include "lldb/Host/common/TCPSocket.h"
-#include "lldb/Host/posix/DomainSocket.h"
+
+#include "Utility/UriParser.h"
using namespace lldb;
using namespace lldb_private;
@@ -58,32 +59,51 @@
{
error.Clear();
- LocalSocketIdFunc local_socket_id;
- std::unique_ptr<Socket> listener_socket = nullptr;
- std::string host_str;
- std::string port_str;
- int32_t port = INT32_MIN;
- if (Socket::DecodeHostAndPort (name, host_str, port_str, port, &error))
+ std::unique_ptr<Socket> listener_socket_up = nullptr;
+
+
+ int port;
+ std::string scheme, host, path;
+ // Try to match socket name as URL - e.g., tcp://localhost:5555
+ if (UriParser::Parse(name.str(), scheme, host, port, path))
{
- auto tcp_socket = new TCPSocket(child_processes_inherit, error);
- local_socket_id = [tcp_socket]() {
- auto local_port = tcp_socket->GetLocalPortNumber();
- return (local_port != 0) ? std::to_string(local_port) : "";
- };
- listener_socket.reset(tcp_socket);
+ listener_socket_up = Socket::Create(scheme.c_str(), child_processes_inherit, error);
+ name = name.drop_front(scheme.size() + strlen("://"));
}
else
{
- const std::string socket_name = name;
- local_socket_id = [socket_name](){
- return socket_name;
- };
- listener_socket.reset(new DomainSocket(child_processes_inherit, error));
+ std::string host_str;
+ std::string port_str;
+ int32_t port = INT32_MIN;
+ // Try to match socket name as $host:port - e.g., localhost:5555
+ if (Socket::DecodeHostAndPort (name, host_str, port_str, port, &error))
+ listener_socket_up = Socket::Create(Socket::TCP, child_processes_inherit, error);
+ else
+ listener_socket_up = Socket::Create(Socket::UNIX, child_processes_inherit, error);
}
+ LocalSocketIdFunc local_socket_id;
if (error.Success())
+ {
+ if (listener_socket_up->GetSocketProtocol() == Socket::ProtocolTcp)
+ {
+ TCPSocket* tcp_socket = static_cast<TCPSocket*>(listener_socket_up.get());
+ local_socket_id = [tcp_socket]() {
+ auto local_port = tcp_socket->GetLocalPortNumber();
+ return (local_port != 0) ? std::to_string(local_port) : "";
+ };
+ }
+ else
+ {
+ const std::string socket_name = name;
+ local_socket_id = [socket_name](){
+ return socket_name;
+ };
+ }
+
return std::unique_ptr<Acceptor>(
- new Acceptor(std::move(listener_socket), name, local_socket_id));
+ new Acceptor(std::move(listener_socket_up), name, local_socket_id));
+ }
return std::unique_ptr<Acceptor>();
}
Index: source/Host/posix/DomainSocket.cpp
===================================================================
--- source/Host/posix/DomainSocket.cpp
+++ source/Host/posix/DomainSocket.cpp
@@ -115,3 +115,9 @@
{
FileSystem::Unlink(FileSpec{name, true});
}
+
+const char *
+DomainSocket::GetScheme() const
+{
+ return UNIX;
+}
Index: source/Host/linux/AbstractSocket.cpp
===================================================================
--- source/Host/linux/AbstractSocket.cpp
+++ source/Host/linux/AbstractSocket.cpp
@@ -29,3 +29,9 @@
AbstractSocket::DeleteSocketFile(llvm::StringRef name)
{
}
+
+const char *
+AbstractSocket::GetScheme() const
+{
+ return UNIX_ABSTRACT;
+}
Index: source/Host/common/UDPSocket.cpp
===================================================================
--- source/Host/common/UDPSocket.cpp
+++ source/Host/common/UDPSocket.cpp
@@ -156,3 +156,9 @@
error.Clear();
return error;
}
+
+const char *
+UDPSocket::GetScheme() const
+{
+ return UDP;
+}
Index: source/Host/common/TCPSocket.cpp
===================================================================
--- source/Host/common/TCPSocket.cpp
+++ source/Host/common/TCPSocket.cpp
@@ -286,3 +286,9 @@
{
return SetOption(SOL_SOCKET, SO_REUSEADDR, 1);
}
+
+const char *
+TCPSocket::GetScheme() const
+{
+ return TCP;
+}
Index: source/Host/common/Socket.cpp
===================================================================
--- source/Host/common/Socket.cpp
+++ source/Host/common/Socket.cpp
@@ -73,6 +73,11 @@
}
+const char * Socket::TCP = "tcp";
+const char * Socket::UDP = "udp";
+const char * Socket::UNIX = "unix";
+const char * Socket::UNIX_ABSTRACT = "unix-abstract";
+
Socket::Socket(NativeSocket socket, SocketProtocol protocol, bool should_close)
: IOObject(eFDTypeSocket, should_close)
, m_protocol(protocol)
@@ -86,14 +91,44 @@
Close();
}
+std::unique_ptr<Socket> Socket::Create(const char *scheme, bool child_processes_inherit, Error &error)
+{
+ error.Clear();
+
+ std::unique_ptr<Socket> socket_up;
+ if (!strcmp(scheme, TCP))
+ socket_up.reset(new TCPSocket(child_processes_inherit, error));
+ else if (!strcmp(scheme, UDP))
+ socket_up.reset(new UDPSocket(child_processes_inherit, error));
+ else if (!strcmp(scheme, UNIX))
+#ifndef LLDB_DISABLE_POSIX
+ socket_up.reset(new DomainSocket(child_processes_inherit, error));
+#else
+ error.SetErrorString("Unix domain sockets are not supported on this platform.");
+#endif
+ else if (!strcmp(scheme, UNIX_ABSTRACT))
+#ifdef __linux__
+ socket_up.reset(new AbstractSocket(child_processes_inherit, error));
+#else
+ error.SetErrorString("Abstract domain sockets are not supported on this platform.");
+#endif
+ else
+ error.SetErrorString("Unknown scheme");
+
+ if (error.Fail())
+ socket_up.reset();
+
+ return socket_up;
+}
+
Error Socket::TcpConnect(llvm::StringRef host_and_port, bool child_processes_inherit, Socket *&socket)
{
Log *log(lldb_private::GetLogIfAnyCategoriesSet (LIBLLDB_LOG_COMMUNICATION));
if (log)
log->Printf ("Socket::%s (host/port = %s)", __FUNCTION__, host_and_port.data());
Error error;
- std::unique_ptr<TCPSocket> connect_socket(new TCPSocket(child_processes_inherit, error));
+ std::unique_ptr<Socket> connect_socket(Create(TCP, child_processes_inherit, error));
if (error.Fail())
return error;
@@ -161,74 +196,59 @@
Error Socket::UnixDomainConnect(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
{
Error error;
-#ifndef LLDB_DISABLE_POSIX
- std::unique_ptr<DomainSocket> connect_socket(new DomainSocket(child_processes_inherit, error));
+ std::unique_ptr<Socket> connect_socket(Create(UNIX, child_processes_inherit, error));
if (error.Fail())
return error;
error = connect_socket->Connect(name);
if (error.Success())
socket = connect_socket.release();
-#else
- error.SetErrorString("Unix domain sockets are not supported on this platform.");
-#endif
+
return error;
}
Error Socket::UnixDomainAccept(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
{
Error error;
-#ifndef LLDB_DISABLE_POSIX
- std::unique_ptr<DomainSocket> listen_socket(new DomainSocket(child_processes_inherit, error));
+ std::unique_ptr<Socket> listen_socket(Create(UNIX, child_processes_inherit, error));
if (error.Fail())
return error;
error = listen_socket->Listen(name, 5);
if (error.Fail())
return error;
error = listen_socket->Accept(name, child_processes_inherit, socket);
-#else
- error.SetErrorString("Unix domain sockets are not supported on this platform.");
-#endif
return error;
}
Error
Socket::UnixAbstractConnect(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
{
Error error;
-#ifdef __linux__
- std::unique_ptr<Socket> connect_socket(new AbstractSocket(child_processes_inherit, error));
+ std::unique_ptr<Socket> connect_socket(Create(UNIX_ABSTRACT, child_processes_inherit, error));
if (error.Fail())
return error;
error = connect_socket->Connect(name);
if (error.Success())
socket = connect_socket.release();
-#else
- error.SetErrorString("Abstract domain sockets are not supported on this platform.");
-#endif
return error;
}
Error
Socket::UnixAbstractAccept(llvm::StringRef name, bool child_processes_inherit, Socket *&socket)
{
Error error;
-#ifdef __linux__
- std::unique_ptr<Socket> listen_socket(new AbstractSocket(child_processes_inherit, error));
+ std::unique_ptr<Socket> listen_socket(Create(UNIX_ABSTRACT,child_processes_inherit, error));
if (error.Fail())
return error;
error = listen_socket->Listen(name, 5);
if (error.Fail())
return error;
error = listen_socket->Accept(name, child_processes_inherit, socket);
-#else
- error.SetErrorString("Abstract domain sockets are not supported on this platform.");
-#endif
return error;
}
Index: include/lldb/Host/posix/DomainSocket.h
===================================================================
--- include/lldb/Host/posix/DomainSocket.h
+++ include/lldb/Host/posix/DomainSocket.h
@@ -23,6 +23,8 @@
Error Listen(llvm::StringRef name, int backlog) override;
Error Accept(llvm::StringRef name, bool child_processes_inherit, Socket *&socket) override;
+ const char * GetScheme() const override;
+
protected:
DomainSocket(SocketProtocol protocol, bool child_processes_inherit, Error &error);
Index: include/lldb/Host/linux/AbstractSocket.h
===================================================================
--- include/lldb/Host/linux/AbstractSocket.h
+++ include/lldb/Host/linux/AbstractSocket.h
@@ -19,6 +19,8 @@
public:
AbstractSocket(bool child_processes_inherit, Error &error);
+ const char * GetScheme() const override;
+
protected:
size_t GetNameOffset() const override;
void DeleteSocketFile(llvm::StringRef name) override;
Index: include/lldb/Host/common/UDPSocket.h
===================================================================
--- include/lldb/Host/common/UDPSocket.h
+++ include/lldb/Host/common/UDPSocket.h
@@ -17,11 +17,13 @@
class UDPSocket: public Socket
{
public:
+ UDPSocket(bool child_processes_inherit, Error &error);
+
static Error Connect(llvm::StringRef name, bool child_processes_inherit, Socket *&send_socket, Socket *&recv_socket);
+ const char * GetScheme() const override;
private:
UDPSocket(NativeSocket socket);
- UDPSocket(bool child_processes_inherit, Error &error);
size_t Send(const void *buf, const size_t num_bytes) override;
Error Connect(llvm::StringRef name) override;
Index: include/lldb/Host/common/TCPSocket.h
===================================================================
--- include/lldb/Host/common/TCPSocket.h
+++ include/lldb/Host/common/TCPSocket.h
@@ -40,6 +40,8 @@
Error Connect(llvm::StringRef name) override;
Error Listen(llvm::StringRef name, int backlog) override;
Error Accept(llvm::StringRef name, bool child_processes_inherit, Socket *&conn_socket) override;
+
+ const char * GetScheme() const override;
};
}
Index: include/lldb/Host/Socket.h
===================================================================
--- include/lldb/Host/Socket.h
+++ include/lldb/Host/Socket.h
@@ -10,6 +10,7 @@
#ifndef liblldb_Host_Socket_h_
#define liblldb_Host_Socket_h_
+#include <memory>
#include <string>
#include "lldb/lldb-private.h"
@@ -49,10 +50,17 @@
ProtocolUnixAbstract
} SocketProtocol;
+ static const char *TCP;
+ static const char *UDP;
+ static const char *UNIX;
+ static const char *UNIX_ABSTRACT;
+
static const NativeSocket kInvalidSocketValue;
~Socket() override;
+ static std::unique_ptr<Socket> Create(const char *scheme, bool child_processes_inherit, Error &error);
+
virtual Error Connect(llvm::StringRef name) = 0;
virtual Error Listen(llvm::StringRef name, int backlog) = 0;
virtual Error Accept(llvm::StringRef name, bool child_processes_inherit, Socket *&socket) = 0;
@@ -78,6 +86,7 @@
NativeSocket GetNativeSocket () const { return m_socket; }
SocketProtocol GetSocketProtocol () const { return m_protocol; }
+ virtual const char* GetScheme() const = 0;
Error Read (void *buf, size_t &num_bytes) override;
Error Write (const void *buf, size_t &num_bytes) override;
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
