[llvm-branch-commits] [lldb] r270546 - Merging r264030:

[Mohit K. Bhakkad via llvm-branch-commits]

Author: mohit.bhakkad
Date: Tue May 24 05:50:09 2016
New Revision: 270546

URL: http://llvm.org/viewvc/llvm-project?rev=270546&view=rev
Log:
Merging r264030:
------------------------------------------------------------------------
r264030 | mohit.bhakkad | 2016-03-22 13:38:02 +0530 (Tue, 22 Mar 2016) | 6 lines

[LLDB]{MIPS] Fix TestPlatformProcessConnect.py
Patch by Nitesh Jain

Reviewers: clayborg, labath.
Subscribers: jaydeep, bhushan, mohit.bhakkad, sagar, lldb-commits.
Differential Revision: http://reviews.llvm.org/D18082
------------------------------------------------------------------------

Modified:
    lldb/branches/release_38/   (props changed)
    lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
    lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
    lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
    lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h

Propchange: lldb/branches/release_38/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue May 24 05:50:09 2016
@@ -1,3 +1,3 @@
 /lldb/branches/apple/python-GIL:156467-162159
 /lldb/branches/iohandler:198360-200250
-/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188,260072,260362,262819
+/lldb/trunk:257691-257692,257926,258485,258621,258684-258685,258758,258761,258919,258967,259188,260072,260362,262819,264030

Modified: lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp?rev=270546&r1=270545&r2=270546&view=diff
==============================================================================
--- lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp (original)
+++ lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.cpp Tue May 24 05:50:09 2016
@@ -258,18 +258,3 @@ PlatformAndroidRemoteGDBServer::ConnectP
                                                    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();
-}

Modified: lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h?rev=270546&r1=270545&r2=270546&view=diff
==============================================================================
--- lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h (original)
+++ lldb/branches/release_38/source/Plugins/Platform/Android/PlatformAndroidRemoteGDBServer.h Tue May 24 05:50:09 2016
@@ -46,9 +46,6 @@ public:
                     lldb_private::Target *target,
                     lldb_private::Error &error) override;
 
-    size_t
-    ConnectToWaitingProcesses(lldb_private::Debugger& debugger, lldb_private::Error& error) override;
-
 protected:
     std::string m_device_id;
     std::map<lldb::pid_t, uint16_t> m_port_forwards;

Modified: lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp?rev=270546&r1=270545&r2=270546&view=diff
==============================================================================
--- lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp (original)
+++ lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.cpp Tue May 24 05:50:09 2016
@@ -1002,6 +1002,22 @@ PlatformRemoteGDBServer::ConnectProcess(
 }
 
 size_t
+PlatformRemoteGDBServer::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();
+
+}
+
+size_t
 PlatformRemoteGDBServer::GetPendingGdbServerList(std::vector<std::string>& connection_urls)
 {
     std::vector<std::pair<uint16_t, std::string>> remote_servers;

Modified: lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h?rev=270546&r1=270545&r2=270546&view=diff
==============================================================================
--- lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h (original)
+++ lldb/branches/release_38/source/Plugins/Platform/gdb-server/PlatformRemoteGDBServer.h Tue May 24 05:50:09 2016
@@ -224,6 +224,9 @@ public:
                     lldb_private::Target *target,
                     lldb_private::Error &error) override;
 
+    size_t
+    ConnectToWaitingProcesses(lldb_private::Debugger& debugger, lldb_private::Error& error) override;
+
     virtual size_t
     GetPendingGdbServerList(std::vector<std::string>& connection_urls);