summaryrefslogtreecommitdiff
path: root/src/citra_qt/debugger/wait_tree.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2018-01-08 21:41:37 -0500
committerGravatar bunnei2018-01-08 21:41:37 -0500
commit423679983259948c203e546887445a59b64fc32f (patch)
treed359c88bb9347677025a9f0e64a08e0ab1733a4a /src/citra_qt/debugger/wait_tree.cpp
parentmutex: Remove unused call to VerifyGuestState. (diff)
downloadyuzu-423679983259948c203e546887445a59b64fc32f.tar.gz
yuzu-423679983259948c203e546887445a59b64fc32f.tar.xz
yuzu-423679983259948c203e546887445a59b64fc32f.zip
kernel: Rename Semaphore to ConditionVariable.
Diffstat (limited to 'src/citra_qt/debugger/wait_tree.cpp')
-rw-r--r--src/citra_qt/debugger/wait_tree.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/src/citra_qt/debugger/wait_tree.cpp b/src/citra_qt/debugger/wait_tree.cpp
index 6d15e43aa..cd03a6554 100644
--- a/src/citra_qt/debugger/wait_tree.cpp
+++ b/src/citra_qt/debugger/wait_tree.cpp
@@ -5,9 +5,9 @@
5#include "citra_qt/debugger/wait_tree.h" 5#include "citra_qt/debugger/wait_tree.h"
6#include "citra_qt/util/util.h" 6#include "citra_qt/util/util.h"
7 7
8#include "core/hle/kernel/condition_variable.h"
8#include "core/hle/kernel/event.h" 9#include "core/hle/kernel/event.h"
9#include "core/hle/kernel/mutex.h" 10#include "core/hle/kernel/mutex.h"
10#include "core/hle/kernel/semaphore.h"
11#include "core/hle/kernel/thread.h" 11#include "core/hle/kernel/thread.h"
12#include "core/hle/kernel/timer.h" 12#include "core/hle/kernel/timer.h"
13#include "core/hle/kernel/wait_object.h" 13#include "core/hle/kernel/wait_object.h"
@@ -85,8 +85,9 @@ std::unique_ptr<WaitTreeWaitObject> WaitTreeWaitObject::make(const Kernel::WaitO
85 return std::make_unique<WaitTreeEvent>(static_cast<const Kernel::Event&>(object)); 85 return std::make_unique<WaitTreeEvent>(static_cast<const Kernel::Event&>(object));
86 case Kernel::HandleType::Mutex: 86 case Kernel::HandleType::Mutex:
87 return std::make_unique<WaitTreeMutex>(static_cast<const Kernel::Mutex&>(object)); 87 return std::make_unique<WaitTreeMutex>(static_cast<const Kernel::Mutex&>(object));
88 case Kernel::HandleType::Semaphore: 88 case Kernel::HandleType::ConditionVariable:
89 return std::make_unique<WaitTreeSemaphore>(static_cast<const Kernel::Semaphore&>(object)); 89 return std::make_unique<WaitTreeConditionVariable>(
90 static_cast<const Kernel::ConditionVariable&>(object));
90 case Kernel::HandleType::Timer: 91 case Kernel::HandleType::Timer:
91 return std::make_unique<WaitTreeTimer>(static_cast<const Kernel::Timer&>(object)); 92 return std::make_unique<WaitTreeTimer>(static_cast<const Kernel::Timer&>(object));
92 case Kernel::HandleType::Thread: 93 case Kernel::HandleType::Thread:
@@ -266,15 +267,15 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeMutex::GetChildren() const {
266 return list; 267 return list;
267} 268}
268 269
269WaitTreeSemaphore::WaitTreeSemaphore(const Kernel::Semaphore& object) 270WaitTreeConditionVariable::WaitTreeConditionVariable(const Kernel::ConditionVariable& object)
270 : WaitTreeWaitObject(object) {} 271 : WaitTreeWaitObject(object) {}
271 272
272std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeSemaphore::GetChildren() const { 273std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeConditionVariable::GetChildren() const {
273 std::vector<std::unique_ptr<WaitTreeItem>> list(WaitTreeWaitObject::GetChildren()); 274 std::vector<std::unique_ptr<WaitTreeItem>> list(WaitTreeWaitObject::GetChildren());
274 275
275 const auto& semaphore = static_cast<const Kernel::Semaphore&>(object); 276 const auto& condition_variable = static_cast<const Kernel::ConditionVariable&>(object);
276 list.push_back(std::make_unique<WaitTreeText>( 277 list.push_back(std::make_unique<WaitTreeText>(
277 tr("available count = %1").arg(semaphore.GetAvailableCount()))); 278 tr("available count = %1").arg(condition_variable.GetAvailableCount())));
278 return list; 279 return list;
279} 280}
280 281