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

1 files changed, 18 insertions, 18 deletions

diff --git a/lldb/source/DataFormatters/FormatManager.cpp b/lldb/source/DataFormatters/FormatManager.cpp
index 35a0468306f..f51243f841e 100644
--- a/lldb/source/DataFormatters/FormatManager.cpp
+++ b/lldb/source/DataFormatters/FormatManager.cpp
@@ -128,7 +128,7 @@ FormatManager::Changed ()
 {
     ++m_last_revision;
     m_format_cache.Clear ();
-    Mutex::Locker lang_locker(m_language_categories_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_language_categories_mutex);
     for (auto& iter : m_language_categories_map)
     {
         if (iter.second)
@@ -181,7 +181,7 @@ void
 FormatManager::EnableAllCategories ()
 {
     m_categories_map.EnableAllCategories ();
-    Mutex::Locker lang_locker(m_language_categories_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_language_categories_mutex);
     for (auto& iter : m_language_categories_map)
     {
         if (iter.second)
@@ -193,7 +193,7 @@ void
 FormatManager::DisableAllCategories ()
 {
     m_categories_map.DisableAllCategories ();
-    Mutex::Locker lang_locker(m_language_categories_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_language_categories_mutex);
     for (auto& iter : m_language_categories_map)
     {
         if (iter.second)
@@ -502,7 +502,7 @@ void
 FormatManager::ForEachCategory(TypeCategoryMap::ForEachCallback callback)
 {
     m_categories_map.ForEach(callback);
-    Mutex::Locker locker(m_language_categories_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_language_categories_mutex);
     for (const auto& entry : m_language_categories_map)
     {
         if (auto category_sp = entry.second->GetCategory())
@@ -712,7 +712,7 @@ FormatManager::GetCandidateLanguages (lldb::LanguageType lang_type)
 LanguageCategory*
 FormatManager::GetCategoryForLanguage (lldb::LanguageType lang_type)
 {
-    Mutex::Locker locker(m_language_categories_mutex);
+    std::lock_guard<std::recursive_mutex> guard(m_language_categories_mutex);
     auto iter = m_language_categories_map.find(lang_type), end = m_language_categories_map.end();
     if (iter != end)
         return iter->second.get();
@@ -1055,22 +1055,22 @@ FormatManager::GetHardcodedValidator (FormattersMatchData& match_data)
     return retval_sp;
 }
 
-FormatManager::FormatManager() :
-    m_last_revision(0),
-    m_format_cache(),
-    m_language_categories_mutex(Mutex::eMutexTypeRecursive),
-    m_language_categories_map(),
-    m_named_summaries_map(this),
-    m_categories_map(this),
-    m_default_category_name(ConstString("default")),
-    m_system_category_name(ConstString("system")), 
-    m_vectortypes_category_name(ConstString("VectorTypes"))
+FormatManager::FormatManager()
+    : m_last_revision(0),
+      m_format_cache(),
+      m_language_categories_mutex(),
+      m_language_categories_map(),
+      m_named_summaries_map(this),
+      m_categories_map(this),
+      m_default_category_name(ConstString("default")),
+      m_system_category_name(ConstString("system")),
+      m_vectortypes_category_name(ConstString("VectorTypes"))
 {
     LoadSystemFormatters();
     LoadVectorFormatters();
-    
-    EnableCategory(m_vectortypes_category_name,TypeCategoryMap::Last, lldb::eLanguageTypeObjC_plus_plus);
-    EnableCategory(m_system_category_name,TypeCategoryMap::Last, lldb::eLanguageTypeObjC_plus_plus);
+
+    EnableCategory(m_vectortypes_category_name, TypeCategoryMap::Last, lldb::eLanguageTypeObjC_plus_plus);
+    EnableCategory(m_system_category_name, TypeCategoryMap::Last, lldb::eLanguageTypeObjC_plus_plus);
 }
 
 void