Modify "platform connect" to connect to processes as well

The standard remote debugging workflow with gdb is to start the
application on the remote host under gdbserver (e.g.: gdbserver :5039
a.out) and then connect to it with gdb.

The same workflow is supported by debugserver/lldb-gdbserver with a very
similar syntax but to access all features of lldb we need to be
connected also to an lldb-platform instance running on the target.

Before this change this had to be done manually with starting a separate
lldb-platform on the target machine and then connecting to it with lldb
before connecting to the process.

This change modifies the behavior of "platform connect" with
automatically connecting to the process instance if it was started by
the remote platform. With this command replacing gdbserver in a gdb
based worflow is usually as simple as replacing the command to execute
gdbserver with executing lldb-platform.

Differential revision: http://reviews.llvm.org/D14952

llvm-svn: 255016

1 files changed, 50 insertions, 0 deletions

diff --git a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
index 9a55be64e4d..3d91dd6b7a3 100644
--- a/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
+++ b/lldb/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
@@ -223,3 +223,53 @@ PlatformAndroidRemoteGDBServer::MakeConnectURL(const lldb::pid_t pid,
 
     return error;
 }
+
+lldb::ProcessSP
+PlatformAndroidRemoteGDBServer::ConnectProcess(const char* connect_url,
+                                               const char* plugin_name,
+                                               lldb_private::Debugger &debugger,
+                                               lldb_private::Target *target,
+                                               lldb_private::Error &error)
+{
+    // We don't have the pid of the remote gdbserver when it isn't started by us but we still want
+    // to store the list of port forwards we set up in our port forward map. Generate a fake pid for
+    // these cases what won't collide with any other valid pid on android.
+    static lldb::pid_t s_remote_gdbserver_fake_pid = 0xffffffffffffffffULL;
+
+    int remote_port;
+    std::string scheme, host, path;
+    if (!UriParser::Parse(connect_url, scheme, host, remote_port, path))
+    {
+        error.SetErrorStringWithFormat("Invalid URL: %s", connect_url);
+        return nullptr;
+    }
+
+    std::string new_connect_url;
+    error = MakeConnectURL(s_remote_gdbserver_fake_pid--,
+                           (remote_port < 0) ? 0 : remote_port,
+                           path.c_str(),
+                           new_connect_url);
+    if (error.Fail())
+        return nullptr;
+
+    return PlatformRemoteGDBServer::ConnectProcess(new_connect_url.c_str(),
+                                                   plugin_name,
+                                                   debugger,
+                                                   target,
+                                                   error);
+}
+
+size_t
+PlatformAndroidRemoteGDBServer::ConnectToWaitingProcesses(Debugger& debugger, Error& error)
+{
+    std::vector<std::string> connection_urls;
+    GetPendingGdbServerList(connection_urls);
+
+    for (size_t i = 0; i < connection_urls.size(); ++i)
+    {
+        ConnectProcess(connection_urls[i].c_str(), nullptr, debugger, nullptr, error);
+        if (error.Fail())
+            return i; // We already connected to i process succsessfully
+    }
+    return connection_urls.size();
+}