[Lldb-commits] [PATCH 2/9] Host::StopMonitoringChildProcess has been removed. Provide a substitute.

[Stephen Wilson]

---
 source/Plugins/Process/Linux/ProcessMonitor.cpp |   19 ++++++++++++++++---
 source/Plugins/Process/Linux/ProcessMonitor.h   |    5 ++++-
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/source/Plugins/Process/Linux/ProcessMonitor.cpp b/source/Plugins/Process/Linux/ProcessMonitor.cpp
index 0b47fc7..e6a7d6f 100644
--- a/source/Plugins/Process/Linux/ProcessMonitor.cpp
+++ b/source/Plugins/Process/Linux/ProcessMonitor.cpp
@@ -459,7 +459,7 @@ ProcessMonitor::ProcessMonitor(ProcessLinux *process,
       m_operation_thread(LLDB_INVALID_HOST_THREAD),
       m_pid(LLDB_INVALID_PROCESS_ID),
       m_terminal_fd(-1),
-      m_monitor_handle(0),
+      m_monitor_thread(LLDB_INVALID_HOST_THREAD),
       m_client_fd(-1),
       m_server_fd(-1)
 {
@@ -499,7 +499,7 @@ WAIT_AGAIN:
     }
 
     // Finally, start monitoring the child process for change in state.
-    if (!(m_monitor_handle = Host::StartMonitoringChildProcess(
+    if (!(m_monitor_thread = Host::StartMonitoringChildProcess(
               ProcessMonitor::MonitorCallback, this, GetPID(), true)))
     {
         error.SetErrorToGenericError();
@@ -510,7 +510,7 @@ WAIT_AGAIN:
 
 ProcessMonitor::~ProcessMonitor()
 {
-    Host::StopMonitoringChildProcess(m_monitor_handle);
+    StopMonitoringChildProcess();
     StopOperationThread();
 
     close(m_terminal_fd);
@@ -923,3 +923,16 @@ ProcessMonitor::DupDescriptor(const char *path, int fd, int flags)
 
     return (dup2(fd, target_fd) == -1) ? false : true;
 }
+
+void
+ProcessMonitor::StopMonitoringChildProcess()
+{
+    lldb::thread_result_t thread_result;
+
+    if (m_monitor_thread != LLDB_INVALID_HOST_THREAD)
+    {
+        Host::ThreadCancel(m_monitor_thread, NULL);
+        Host::ThreadJoin(m_monitor_thread, &thread_result, NULL);
+        m_monitor_thread = LLDB_INVALID_HOST_THREAD;
+    }
+}
diff --git a/source/Plugins/Process/Linux/ProcessMonitor.h b/source/Plugins/Process/Linux/ProcessMonitor.h
index cd23d98..a4719c0 100644
--- a/source/Plugins/Process/Linux/ProcessMonitor.h
+++ b/source/Plugins/Process/Linux/ProcessMonitor.h
@@ -140,7 +140,7 @@ private:
     lldb::pid_t m_pid;
     int m_terminal_fd;
 
-    uint32_t m_monitor_handle;
+    uint32_t m_monitor_thread;
 
     lldb_private::Mutex m_server_mutex;
     int m_client_fd;
@@ -203,6 +203,9 @@ private:
 
     void
     DoOperation(Operation *op);
+
+    /// Stops the child monitor thread.
+    void StopMonitoringChildProcess();
 };
 
 #endif // #ifndef liblldb_ProcessMonitor_H_
-- 
1.7.3.2