commit 5abe726911d4e2bf80bbbd93d0a2e2b8064c2fd3
author Pavel Labath <labath@google.com> Thu Jul 16 08:45:03 2015 +0000
committer Pavel Labath <labath@google.com> Thu Jul 16 08:45:03 2015 +0000
tree b2ccecfb410d8bbed16af12caab16218b12a004e
parent d783a983033dfb41a116806c92b4f9250997e025

Revert "[NativeProcessLinux] Integrate MainLoop"

This seems to be causing major slowdows on the android buildbot. Reverting while I investigate.

llvm-svn: 242391

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp

diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
index c00ea92..c452325 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.cpp
@@ -96,6 +96,20 @@
     RegisterPacketHandlers();
 }
 
+//----------------------------------------------------------------------
+// Destructor
+//----------------------------------------------------------------------
+GDBRemoteCommunicationServerLLGS::~GDBRemoteCommunicationServerLLGS()
+{
+    Mutex::Locker locker (m_debugged_process_mutex);
+
+    if (m_debugged_process_sp)
+    {
+        m_debugged_process_sp->Terminate ();
+        m_debugged_process_sp.reset ();
+    }
+}
+
 void
 GDBRemoteCommunicationServerLLGS::RegisterPacketHandlers()
 {
@@ -209,7 +223,6 @@
         error = NativeProcessProtocol::Launch(
             m_process_launch_info,
             *this,
-            m_mainloop,
             m_debugged_process_sp);
     }
 
@@ -295,7 +308,7 @@
         }
 
         // Try to attach.
-        error = NativeProcessProtocol::Attach(pid, *this, m_mainloop, m_debugged_process_sp);
+        error = NativeProcessProtocol::Attach(pid, *this, m_debugged_process_sp);
         if (!error.Success ())
         {
             fprintf (stderr, "%s: failed to attach to process %" PRIu64 ": %s", __FUNCTION__, pid, error.AsCString ());

lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h

diff --git a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h
index 74e3a33..29f3fde 100644
--- a/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h
+++ b/lldb/source/Plugins/Process/gdb-remote/GDBRemoteCommunicationServerLLGS.h
@@ -42,6 +42,9 @@
     //------------------------------------------------------------------
     GDBRemoteCommunicationServerLLGS(const lldb::PlatformSP& platform_sp, MainLoop &mainloop);
 
+    virtual
+    ~GDBRemoteCommunicationServerLLGS();
+
     //------------------------------------------------------------------
     /// Specify the program to launch and its arguments.
     ///