From 8bc34f4d96a4b6cf736dad96bc83156b3014bb53 Mon Sep 17 00:00:00 2001
From: Oleksiy Vyalov <ovyalov@google.com>
Date: Thu, 19 Feb 2015 17:58:04 +0000
Subject:  Prevent LLGS from crashing when exiting - make NativeProcessLinux to
 wait until ThreadStateCoordinator is fully stopped before entering
 ~NativeProcessLinux.

http://reviews.llvm.org/D7692

llvm-svn: 229875
---
 lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp')

diff --git a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
index a72b6a24063a..068c40296858 100644
--- a/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
+++ b/lldb/source/Plugins/Process/Linux/NativeProcessLinux.cpp
@@ -1453,7 +1453,8 @@ WAIT_AGAIN:
     }
 }
 
-NativeProcessLinux::~NativeProcessLinux()
+void
+NativeProcessLinux::Terminate ()
 {
     StopMonitor();
 }
@@ -3637,6 +3638,7 @@ NativeProcessLinux::StopCoordinatorThread()
     // Tell the coordinator we're done.  This will cause the coordinator
     // run loop thread to exit when the processing queue hits this message.
     m_coordinator_up->StopCoordinator ();
+    m_coordinator_thread.Join (nullptr);
 }
 
 bool
-- 
cgit v1.2.3