[Lldb-commits] [lldb] r204752 - Move calls to DisableAllBreakpointSites() and m_thread_list.DiscardThreadPlans() into base Process::Destroy() instead of in subclass DoDestroy() methods.

[Andrew MacPherson]

Author: andrewmacp
Date: Tue Mar 25 14:59:36 2014
New Revision: 204752

URL: http://llvm.org/viewvc/llvm-project?rev=204752&view=rev
Log:
Move calls to DisableAllBreakpointSites() and m_thread_list.DiscardThreadPlans() into base Process::Destroy() instead of in subclass DoDestroy() methods.

Modified:
    lldb/trunk/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
    lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
    lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
    lldb/trunk/source/Target/Process.cpp

Modified: lldb/trunk/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp?rev=204752&r1=204751&r2=204752&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp (original)
+++ lldb/trunk/source/Plugins/Process/FreeBSD/ProcessFreeBSD.cpp Tue Mar 25 14:59:36 2014
@@ -133,8 +133,6 @@ ProcessFreeBSD::DoDetach(bool keep_stopp
         return error;
     }
 
-    DisableAllBreakpointSites();
-
     error = m_monitor->Detach(GetID());
 
     if (error.Success())

Modified: lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp?rev=204752&r1=204751&r2=204752&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp (original)
+++ lldb/trunk/source/Plugins/Process/MacOSX-Kernel/ProcessKDP.cpp Tue Mar 25 14:59:36 2014
@@ -599,10 +599,6 @@ ProcessKDP::DoDetach(bool keep_stopped)
     }
     else
     {
-        DisableAllBreakpointSites ();
-        
-        m_thread_list.DiscardThreadPlans();
-        
         // If we are going to keep the target stopped, then don't send the disconnect message.
         if (!keep_stopped && m_comm.IsConnected())
         {

Modified: lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp?rev=204752&r1=204751&r2=204752&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp (original)
+++ lldb/trunk/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp Tue Mar 25 14:59:36 2014
@@ -1866,10 +1866,6 @@ ProcessGDBRemote::DoDetach(bool keep_sto
     if (log)
         log->Printf ("ProcessGDBRemote::DoDetach(keep_stopped: %i)", keep_stopped);
  
-    DisableAllBreakpointSites ();
-
-    m_thread_list.DiscardThreadPlans();
-
     error = m_gdb_comm.Detach (keep_stopped);
     if (log)
     {

Modified: lldb/trunk/source/Target/Process.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Process.cpp?rev=204752&r1=204751&r2=204752&view=diff
==============================================================================
--- lldb/trunk/source/Target/Process.cpp (original)
+++ lldb/trunk/source/Target/Process.cpp Tue Mar 25 14:59:36 2014
@@ -3692,6 +3692,9 @@ Process::Detach (bool keep_stopped)
             }
         }
     
+        m_thread_list.DiscardThreadPlans();
+        DisableAllBreakpointSites();
+
         error = DoDetach(keep_stopped);
         if (error.Success())
         {