From facb2555a9dab30eb76281122f3917f21e58fe84 Mon Sep 17 00:00:00 2001 From: Lectem Date: Sun, 26 Jul 2015 15:56:45 +0200 Subject: [PATCH] citra-qt/debug_utils: Use lock_guard everywhere unique_lock were being used as lock_guards. Also replaced manual lock/unlock by lock_guard for harmonization. --- src/video_core/debug_utils/debug_utils.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/video_core/debug_utils/debug_utils.cpp b/src/video_core/debug_utils/debug_utils.cpp index 827b09dff..27000283d 100644 --- a/src/video_core/debug_utils/debug_utils.cpp +++ b/src/video_core/debug_utils/debug_utils.cpp @@ -62,7 +62,7 @@ void DebugContext::OnEvent(Event event, void* data) { void DebugContext::Resume() { { - std::unique_lock lock(breakpoint_mutex); + std::lock_guard lock(breakpoint_mutex); // Tell all observers that we are about to resume for (auto& breakpoint_observer : breakpoint_observers) { @@ -268,11 +268,10 @@ void StartPicaTracing() return; } - pica_trace_mutex.lock(); + std::lock_guard lock(pica_trace_mutex); pica_trace = std::unique_ptr(new PicaTrace); is_pica_tracing = true; - pica_trace_mutex.unlock(); } bool IsPicaTracing() @@ -286,7 +285,7 @@ void OnPicaRegWrite(PicaTrace::Write write) if (!is_pica_tracing) return; - std::unique_lock lock(pica_trace_mutex); + std::lock_guard lock(pica_trace_mutex); if (!is_pica_tracing) return; @@ -305,9 +304,9 @@ std::unique_ptr FinishPicaTracing() is_pica_tracing = false; // Wait until running tracing is finished - pica_trace_mutex.lock(); + std::lock_guard lock(pica_trace_mutex); std::unique_ptr ret(std::move(pica_trace)); - pica_trace_mutex.unlock(); + return std::move(ret); }