Delete port forwarding if ConnectRemote fails.

[ovyalov]

Summary

Since there is a possibility that we can call ConnectRemote a few times (for example, lldb-server is taking time to start) adding such precautionary measure to be sure that ConnectRemote doesn't introduce any leftovers.

[tberghammer]

LGTM.

Thanks for fixing the port forward leak.

[ovyalov]

AFFECTED FILES

/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
/lldb/trunk/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h

USERS

ovyalov (Author)

http://reviews.llvm.org/rL234332

source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h

protected:
     std::map<lldb::pid_t, std::pair<uint16_t, std::string>> m_port_forwards;
 
     uint16_t
     LaunchGDBserverAndGetPort (lldb::pid_t &pid) override;
 
     bool
     KillSpawnedProcess (lldb::pid_t pid) override;
 
+    void
+    DeleteForwardPort (lldb::pid_t pid);
+
 private:
     DISALLOW_COPY_AND_ASSIGN (PlatformAndroidRemoteGDBServer);
 
 };
 
 } // namespace platform_android
 } // namespace lldb_private
 
 #endif  // liblldb_PlatformAndroidRemoteGDBServer_h_

source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp

PlatformAndroidRemoteGDBServer::LaunchGDBserverAndGetPort (lldb::pid_t &pid)
     m_port_forwards[pid] = std::make_pair (port, device_id);
 
     return port;
 }
 
 bool
 PlatformAndroidRemoteGDBServer::KillSpawnedProcess (lldb::pid_t pid)
 {
-    auto it = m_port_forwards.find (pid);
-    if (it != m_port_forwards.end ())
-    {
-        DeleteForwardPortWithAdb (it->second.first, it->second.second);
-        m_port_forwards.erase (it);
-    }
-
+    DeleteForwardPort (pid);
     return m_gdb_client.KillSpawnedProcess (pid);
 }
 
 Error
 PlatformAndroidRemoteGDBServer::ConnectRemote (Args& args)
 {
     if (args.GetArgumentCount () != 1)
         return Error ("\"platform connect\" takes a single argument: <connect-url>");
   
     int port;
     std::string scheme, host, path;
     const char *url = args.GetArgumentAtIndex (0);
     if (!UriParser::Parse (url, scheme, host, port, path))
         return Error ("invalid uri");
 
     std::string device_id;
     Error error = ForwardPortWithAdb (port, device_id);
     if (error.Fail ())
         return error;
 
     m_port_forwards[g_remote_platform_pid] = std::make_pair (port, device_id);
 
-    return PlatformRemoteGDBServer::ConnectRemote (args);
+    error = PlatformRemoteGDBServer::ConnectRemote (args);
+    if (error.Fail ())
+        DeleteForwardPort (g_remote_platform_pid);
+
+    return error;
 }
 
 Error
 PlatformAndroidRemoteGDBServer::DisconnectRemote ()
 {
-    auto it = m_port_forwards.find (g_remote_platform_pid);
-    if (it != m_port_forwards.end ())
-    {
-        DeleteForwardPortWithAdb (it->second.first, it->second.second);
-        m_port_forwards.erase (it);
-    }
+    DeleteForwardPort (g_remote_platform_pid);
+    return PlatformRemoteGDBServer::DisconnectRemote ();
 
-    return PlatformRemoteGDBServer::DisconnectRemote ();
+void
+PlatformAndroidRemoteGDBServer::DeleteForwardPort (lldb::pid_t pid)
+{
+    Log *log(GetLogIfAllCategoriesSet (LIBLLDB_LOG_PLATFORM));
+
+    auto it = m_port_forwards.find (pid);
+    if (it == m_port_forwards.end ())
+        return;
+
+    const auto& forward_val = it->second;
+    const auto error = DeleteForwardPortWithAdb (forward_val.first, forward_val.second);
+    if (error.Fail ()) {
+        if (log)
+            log->Printf ("Failed to delete port forwarding (pid=%" PRIu64 ", port=%d, device=%s): %s",
+                         pid, forward_val.first, forward_val.second.c_str (), error.AsCString ());
+    }
+    m_port_forwards.erase (it);
 }