Add domain socket support to gdb-remote protocol and lldb-server.
http://reviews.llvm.org/D13881
llvm-svn: 250933
diff --git a/lldb/source/Plugins/Platform/Android/AdbClient.cpp b/lldb/source/Plugins/Platform/Android/AdbClient.cpp
index 17fccb3..f57e8c3 100644
--- a/lldb/source/Plugins/Platform/Android/AdbClient.cpp
+++ b/lldb/source/Plugins/Platform/Android/AdbClient.cpp
@@ -145,6 +145,19 @@
}
Error
+AdbClient::SetPortForwarding (const uint16_t local_port, const char* remote_socket_name)
+{
+ char message[PATH_MAX];
+ snprintf (message, sizeof (message), "forward:tcp:%d;localfilesystem:%s", local_port, remote_socket_name);
+
+ const auto error = SendDeviceMessage (message);
+ if (error.Fail ())
+ return error;
+
+ return ReadResponseStatus ();
+}
+
+Error
AdbClient::DeletePortForwarding (const uint16_t local_port)
{
char message[32];
diff --git a/lldb/source/Plugins/Platform/Android/AdbClient.h b/lldb/source/Plugins/Platform/Android/AdbClient.h
index 25a7264..43aa1db 100644
--- a/lldb/source/Plugins/Platform/Android/AdbClient.h
+++ b/lldb/source/Plugins/Platform/Android/AdbClient.h
@@ -51,6 +51,9 @@
SetPortForwarding (const uint16_t local_port, const uint16_t remote_port);
Error
+ SetPortForwarding (const uint16_t local_port, const char* remote_socket_name);
+
+ Error
DeletePortForwarding (const uint16_t local_port);
Error
diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
index 403e641..0706c9b 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroid.cpp
@@ -196,8 +196,7 @@
return Error("URL is null.");
if (!UriParser::Parse(url, scheme, host, port, path))
return Error("Invalid URL: %s", url);
- if (scheme == "adb")
- m_device_id = host;
+ m_device_id = host;
auto error = PlatformLinux::ConnectRemote(args);
if (error.Success())
diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
index 3e07442..1abc708 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
@@ -24,7 +24,10 @@
static const lldb::pid_t g_remote_platform_pid = 0; // Alias for the process id of lldb-platform
static Error
-ForwardPortWithAdb (const uint16_t local_port, const uint16_t remote_port, std::string& device_id)
+ForwardPortWithAdb (const uint16_t local_port,
+ const uint16_t remote_port,
+ const char* remote_socket_name,
+ std::string& device_id)
{
Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_PLATFORM));
@@ -37,7 +40,16 @@
if (log)
log->Printf("Connected to Android device \"%s\"", device_id.c_str ());
- return adb.SetPortForwarding(local_port, remote_port);
+ if (remote_port != 0)
+ {
+ if (log)
+ log->Printf("Forwarding remote TCP port %d to local TCP port %d", remote_port, local_port);
+ return adb.SetPortForwarding(local_port, remote_port);
+ }
+
+ if (log)
+ log->Printf("Forwarding remote socket \"%s\" to local TCP port %d", remote_socket_name, local_port);
+ return adb.SetPortForwarding(local_port, remote_socket_name);
}
static Error
@@ -72,16 +84,24 @@
DeleteForwardPortWithAdb(it.second, m_device_id);
}
-uint16_t
-PlatformAndroidRemoteGDBServer::LaunchGDBserverAndGetPort (lldb::pid_t &pid)
+bool
+PlatformAndroidRemoteGDBServer::LaunchGDBServer (lldb::pid_t &pid, std::string &connect_url)
{
- uint16_t remote_port = m_gdb_client.LaunchGDBserverAndGetPort (pid, "127.0.0.1");
- if (remote_port == 0)
- return remote_port;
+ uint16_t remote_port = 0;
+ std::string socket_name;
+ if (!m_gdb_client.LaunchGDBServer ("127.0.0.1", pid, remote_port, socket_name))
+ return false;
- uint16_t local_port = 0;
- auto error = SetPortForwarding (pid, remote_port, local_port);
- return error.Success() ? local_port : 0;
+ Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PLATFORM));
+
+ auto error = MakeConnectURL (pid,
+ remote_port,
+ socket_name.c_str (),
+ connect_url);
+ if (error.Success() && log)
+ log->Printf("gdbserver connect URL: %s", connect_url.c_str());
+
+ return error.Success();
}
bool
@@ -106,21 +126,22 @@
return Error("URL is null.");
if (!UriParser::Parse (url, scheme, host, remote_port, path))
return Error("Invalid URL: %s", url);
- if (scheme == "adb")
- m_device_id = host;
+ m_device_id = host;
- uint16_t local_port = 0;
- auto error = SetPortForwarding (g_remote_platform_pid, remote_port, local_port);
+ std::string connect_url;
+ auto error = MakeConnectURL (g_remote_platform_pid,
+ (remote_port < 0) ? 0 : remote_port,
+ path.c_str (),
+ connect_url);
+
if (error.Fail ())
return error;
- const std::string new_url = MakeUrl(
- scheme.c_str(), host.c_str(), local_port, path.c_str());
- args.ReplaceArgumentAtIndex (0, new_url.c_str ());
+ args.ReplaceArgumentAtIndex (0, connect_url.c_str ());
Log *log(GetLogIfAllCategoriesSet(LIBLLDB_LOG_PLATFORM));
if (log)
- log->Printf("Rewritten URL: %s", new_url.c_str());
+ log->Printf("Rewritten platform connect URL: %s", connect_url.c_str());
error = PlatformRemoteGDBServer::ConnectRemote(args);
if (error.Fail ())
@@ -156,9 +177,10 @@
}
Error
-PlatformAndroidRemoteGDBServer::SetPortForwarding(const lldb::pid_t pid,
- const uint16_t remote_port,
- uint16_t &local_port)
+PlatformAndroidRemoteGDBServer::MakeConnectURL(const lldb::pid_t pid,
+ const uint16_t remote_port,
+ const char* remote_socket_name,
+ std::string& connect_url)
{
static const int kAttempsNum = 5;
@@ -168,35 +190,21 @@
// adding the loop to mitigate such problem.
for (auto i = 0; i < kAttempsNum; ++i)
{
+ uint16_t local_port = 0;
error = FindUnusedPort(local_port);
if (error.Fail())
return error;
- error = ForwardPortWithAdb(local_port, remote_port, m_device_id);
+ error = ForwardPortWithAdb(local_port, remote_port, remote_socket_name, m_device_id);
if (error.Success())
{
m_port_forwards[pid] = local_port;
+ std::ostringstream url_str;
+ url_str << "connect://localhost:" << local_port;
+ connect_url = url_str.str();
break;
}
}
return error;
}
-
-std::string
-PlatformAndroidRemoteGDBServer::MakeUrl(const char* scheme,
- const char* hostname,
- uint16_t port,
- const char* path)
-{
- std::ostringstream hostname_str;
- if (!strcmp(scheme, "adb"))
- hostname_str << "[" << hostname << "]";
- else
- hostname_str << hostname;
-
- return PlatformRemoteGDBServer::MakeUrl(scheme,
- hostname_str.str().c_str(),
- port,
- path);
-}
diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
index a6dccb8..9555c73 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
@@ -40,8 +40,8 @@
std::string m_device_id;
std::map<lldb::pid_t, uint16_t> m_port_forwards;
- uint16_t
- LaunchGDBserverAndGetPort (lldb::pid_t &pid) override;
+ bool
+ LaunchGDBServer (lldb::pid_t &pid, std::string &connect_url) override;
bool
KillSpawnedProcess (lldb::pid_t pid) override;
@@ -49,14 +49,11 @@
void
DeleteForwardPort (lldb::pid_t pid);
- std::string
- MakeUrl(const char* scheme,
- const char* hostname,
- uint16_t port,
- const char* path) override;
-
Error
- SetPortForwarding(const lldb::pid_t pid, const uint16_t remote_port, uint16_t &local_port);
+ MakeConnectURL(const lldb::pid_t pid,
+ const uint16_t remote_port,
+ const char* remote_socket_name,
+ std::string& connect_url);
private:
DISALLOW_COPY_AND_ASSIGN (PlatformAndroidRemoteGDBServer);
diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
index bf5c328..ea83027b 100644
--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
@@ -573,9 +573,8 @@
if (IsConnected())
{
lldb::pid_t debugserver_pid = LLDB_INVALID_PROCESS_ID;
- uint16_t port = LaunchGDBserverAndGetPort(debugserver_pid);
-
- if (port == 0)
+ std::string connect_url;
+ if (!LaunchGDBServer(debugserver_pid, connect_url))
{
error.SetErrorStringWithFormat ("unable to launch a GDB server on '%s'", GetHostname ());
}
@@ -606,8 +605,6 @@
if (process_sp)
{
- std::string connect_url =
- MakeGdbServerUrl(m_platform_scheme, m_platform_hostname, port);
error = process_sp->ConnectRemote (nullptr, connect_url.c_str());
// Retry the connect remote one time...
if (error.Fail())
@@ -632,23 +629,36 @@
}
-uint16_t
-PlatformRemoteGDBServer::LaunchGDBserverAndGetPort (lldb::pid_t &pid)
+bool
+PlatformRemoteGDBServer::LaunchGDBServer (lldb::pid_t &pid, std::string &connect_url)
{
ArchSpec remote_arch = GetRemoteSystemArchitecture ();
llvm::Triple &remote_triple = remote_arch.GetTriple ();
+
+ uint16_t port = 0;
+ std::string socket_name;
+ bool launch_result = false;
if (remote_triple.getVendor () == llvm::Triple::Apple && remote_triple.getOS () == llvm::Triple::IOS)
{
// When remote debugging to iOS, we use a USB mux that always talks
// to localhost, so we will need the remote debugserver to accept connections
// only from localhost, no matter what our current hostname is
- return m_gdb_client.LaunchGDBserverAndGetPort (pid, "127.0.0.1");
+ launch_result = m_gdb_client.LaunchGDBServer ("127.0.0.1", pid, port, socket_name);
}
else
{
// All other hosts should use their actual hostname
- return m_gdb_client.LaunchGDBserverAndGetPort (pid, NULL);
+ launch_result = m_gdb_client.LaunchGDBServer (nullptr, pid, port, socket_name);
}
+
+ if (!launch_result)
+ return false;
+
+ connect_url = MakeGdbServerUrl(m_platform_scheme,
+ m_platform_hostname,
+ port,
+ (socket_name.empty()) ? nullptr : socket_name.c_str());
+ return true;
}
bool
@@ -669,9 +679,8 @@
if (IsConnected())
{
lldb::pid_t debugserver_pid = LLDB_INVALID_PROCESS_ID;
- uint16_t port = LaunchGDBserverAndGetPort(debugserver_pid);
-
- if (port == 0)
+ std::string connect_url;
+ if (!LaunchGDBServer(debugserver_pid, connect_url))
{
error.SetErrorStringWithFormat ("unable to launch a GDB server on '%s'", GetHostname ());
}
@@ -699,11 +708,8 @@
// The darwin always currently uses the GDB remote debugger plug-in
// so even when debugging locally we are debugging remotely!
process_sp = target->CreateProcess (attach_info.GetListenerForProcess(debugger), "gdb-remote", NULL);
-
if (process_sp)
{
- std::string connect_url =
- MakeGdbServerUrl(m_platform_scheme, m_platform_hostname, port);
error = process_sp->ConnectRemote(nullptr, connect_url.c_str());
if (error.Success())
{
@@ -950,7 +956,8 @@
std::string
PlatformRemoteGDBServer::MakeGdbServerUrl(const std::string &platform_scheme,
const std::string &platform_hostname,
- uint16_t port)
+ uint16_t port,
+ const char* socket_name)
{
const char *override_scheme = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_SCHEME");
const char *override_hostname = getenv("LLDB_PLATFORM_REMOTE_GDB_SERVER_HOSTNAME");
@@ -960,17 +967,19 @@
return MakeUrl(override_scheme ? override_scheme : platform_scheme.c_str(),
override_hostname ? override_hostname : platform_hostname.c_str(),
port + port_offset,
- nullptr);
+ socket_name);
}
std::string
PlatformRemoteGDBServer::MakeUrl(const char* scheme,
- const char* hostname,
- uint16_t port,
- const char* path)
+ const char* hostname,
+ uint16_t port,
+ const char* path)
{
StreamString result;
- result.Printf("%s://%s:%u", scheme, hostname, port);
+ result.Printf("%s://%s", scheme, hostname);
+ if (port != 0)
+ result.Printf(":%u", port);
if (path)
result.Write(path, strlen(path));
return result.GetString();
diff --git a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
index 7b997e8..ffba509 100644
--- a/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
+++ b/lldb/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
@@ -225,11 +225,12 @@
lldb::UnixSignalsSP m_remote_signals_sp;
- // Launch the lldb-gdbserver on the remote host and return the port it is listening on or 0 on
- // failure. Subclasses should override this method if they want to do extra actions before or
- // after launching the lldb-gdbserver.
- virtual uint16_t
- LaunchGDBserverAndGetPort (lldb::pid_t &pid);
+ // Launch the debug server on the remote host - caller connects to launched
+ // debug server using connect_url.
+ // Subclasses should override this method if they want to do extra actions before or
+ // after launching the debug server.
+ virtual bool
+ LaunchGDBServer (lldb::pid_t &pid, std::string &connect_url);
virtual bool
KillSpawnedProcess (lldb::pid_t pid);
@@ -244,7 +245,8 @@
std::string
MakeGdbServerUrl(const std::string &platform_scheme,
const std::string &platform_hostname,
- uint16_t port);
+ uint16_t port,
+ const char* socket_name);
DISALLOW_COPY_AND_ASSIGN (PlatformRemoteGDBServer);