commit 16ff8604690ea63a3a82dd3b156061afb84dbcf1
author Saleem Abdulrasool <compnerd@compnerd.org> Wed May 18 01:59:10 2016 +0000
committer Saleem Abdulrasool <compnerd@compnerd.org> Wed May 18 01:59:10 2016 +0000
tree a2d912258ecb0690f4a810ca1e438fc277160326
parent a36a61d46ac3f2ea10e78ac816bca5784bc8ba35

remove use of Mutex in favour of std::{,recursive_}mutex

This is a pretty straightforward first pass over removing a number of uses of
Mutex in favor of std::mutex or std::recursive_mutex. The problem is that there
are interfaces which take Mutex::Locker & to lock internal locks. This patch
cleans up most of the easy cases. The only non-trivial change is in
CommandObjectTarget.cpp where a Mutex::Locker was split into two.

llvm-svn: 269877

lldb/source/Initialization/SystemLifetimeManager.cpp

diff --git a/lldb/source/Initialization/SystemLifetimeManager.cpp b/lldb/source/Initialization/SystemLifetimeManager.cpp
index eafbe68..0f61622 100644
--- a/lldb/source/Initialization/SystemLifetimeManager.cpp
+++ b/lldb/source/Initialization/SystemLifetimeManager.cpp
@@ -10,16 +10,13 @@
 #include "lldb/Initialization/SystemLifetimeManager.h"
 
 #include "lldb/Core/Debugger.h"
-#include "lldb/Host/Mutex.h"
 #include "lldb/Initialization/SystemInitializer.h"
 
 #include <utility>
 
 using namespace lldb_private;
 
-SystemLifetimeManager::SystemLifetimeManager()
-    : m_mutex(Mutex::eMutexTypeRecursive)
-    , m_initialized(false)
+SystemLifetimeManager::SystemLifetimeManager() : m_mutex(), m_initialized(false)
 {
 }
 
@@ -32,7 +29,7 @@
 SystemLifetimeManager::Initialize(std::unique_ptr<SystemInitializer> initializer,
                                   LoadPluginCallbackType plugin_callback)
 {
-    Mutex::Locker locker(m_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
     if (!m_initialized)
     {
         assert(!m_initializer &&
@@ -48,7 +45,7 @@
 void
 SystemLifetimeManager::Terminate()
 {
-    Mutex::Locker locker(m_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_mutex);
 
     if (m_initialized)
     {