| commit | bb19a13c0b3fe1ecdc1e46bbf2b06ffc1e25e04e | [log] [tgz] |
|---|---|---|
| author | Saleem Abdulrasool <compnerd@compnerd.org> | Thu May 19 05:13:57 2016 +0000 |
| committer | Saleem Abdulrasool <compnerd@compnerd.org> | Thu May 19 05:13:57 2016 +0000 |
| tree | a4383c7cf16b2a6b8e8aa1ff61435ceec0c6a7de | |
| parent | fe12d0e3e551a29b880ecfc7673810ce18567765 [diff] |
second pass over removal of Mutex and Condition llvm-svn: 270024
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp index 9430e38..6d83f7a 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCRuntime.cpp
@@ -394,8 +394,8 @@ return ObjCRuntimeVersions::eObjC_VersionUnknown; const ModuleList &target_modules = target.GetImages(); - Mutex::Locker modules_locker(target_modules.GetMutex()); - + std::lock_guard<std::recursive_mutex> gaurd(target_modules.GetMutex()); + size_t num_images = target_modules.GetSize(); for (size_t i = 0; i < num_images; i++) { @@ -524,7 +524,7 @@ { if (!HasReadObjCLibrary ()) { - Mutex::Locker locker (module_list.GetMutex ()); + std::lock_guard<std::recursive_mutex> guard(module_list.GetMutex()); size_t num_modules = module_list.GetSize(); for (size_t i = 0; i < num_modules; i++)
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp index 56aa36e..1b8350f 100644 --- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp +++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTrampolineHandler.cpp
@@ -462,7 +462,7 @@ Target &target = process_sp->GetTarget(); const ModuleList &target_modules = target.GetImages(); - Mutex::Locker modules_locker(target_modules.GetMutex()); + std::lock_guard<std::recursive_mutex> guard(target_modules.GetMutex()); size_t num_modules = target_modules.GetSize(); if (!m_objc_module_sp) {
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp index 8d1dfdc..4ca0a38 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp
@@ -871,7 +871,7 @@ void RenderScriptRuntime::ModulesDidLoad(const ModuleList &module_list) { - Mutex::Locker locker(module_list.GetMutex()); + std::lock_guard<std::recursive_mutex> guard(module_list.GetMutex()); size_t num_modules = module_list.GetSize(); for (size_t i = 0; i < num_modules; i++)