summaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/debugger/wait_tree.cpp72
-rw-r--r--src/yuzu/debugger/wait_tree.h36
2 files changed, 3 insertions, 105 deletions
diff --git a/src/yuzu/debugger/wait_tree.cpp b/src/yuzu/debugger/wait_tree.cpp
index 7f7c5fc42..0783a2430 100644
--- a/src/yuzu/debugger/wait_tree.cpp
+++ b/src/yuzu/debugger/wait_tree.cpp
@@ -112,33 +112,6 @@ QString WaitTreeText::GetText() const {
return text;
}
-WaitTreeMutexInfo::WaitTreeMutexInfo(VAddr mutex_address_, const Kernel::KHandleTable& handle_table,
- Core::System& system_)
- : mutex_address{mutex_address_}, system{system_} {
- mutex_value = system.Memory().Read32(mutex_address);
- owner_handle = static_cast<Kernel::Handle>(mutex_value & Kernel::Svc::HandleWaitMask);
- owner = handle_table.GetObject<Kernel::KThread>(owner_handle).GetPointerUnsafe();
-}
-
-WaitTreeMutexInfo::~WaitTreeMutexInfo() = default;
-
-QString WaitTreeMutexInfo::GetText() const {
- return tr("waiting for mutex 0x%1").arg(mutex_address, 16, 16, QLatin1Char{'0'});
-}
-
-std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeMutexInfo::GetChildren() const {
- const bool has_waiters = (mutex_value & Kernel::Svc::HandleWaitMask) != 0;
-
- std::vector<std::unique_ptr<WaitTreeItem>> list;
- list.push_back(std::make_unique<WaitTreeText>(tr("has waiters: %1").arg(has_waiters)));
- list.push_back(std::make_unique<WaitTreeText>(
- tr("owner handle: 0x%1").arg(owner_handle, 8, 16, QLatin1Char{'0'})));
- if (owner != nullptr) {
- list.push_back(std::make_unique<WaitTreeThread>(*owner, system));
- }
- return list;
-}
-
WaitTreeCallstack::WaitTreeCallstack(const Kernel::KThread& thread_, Core::System& system_)
: thread{thread_}, system{system_} {}
WaitTreeCallstack::~WaitTreeCallstack() = default;
@@ -182,10 +155,9 @@ bool WaitTreeExpandableItem::IsExpandable() const {
}
QString WaitTreeSynchronizationObject::GetText() const {
- return tr("[%1] %2 %3")
+ return tr("[%1] %2")
.arg(object.GetId())
- .arg(QString::fromStdString(object.GetTypeObj().GetName()),
- QString::fromStdString(object.GetName()));
+ .arg(QString::fromStdString(object.GetTypeObj().GetName()));
}
std::unique_ptr<WaitTreeSynchronizationObject> WaitTreeSynchronizationObject::make(
@@ -217,26 +189,6 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeSynchronizationObject::GetChi
return list;
}
-WaitTreeObjectList::WaitTreeObjectList(const std::vector<Kernel::KSynchronizationObject*>& list,
- bool w_all, Core::System& system_)
- : object_list(list), wait_all(w_all), system{system_} {}
-
-WaitTreeObjectList::~WaitTreeObjectList() = default;
-
-QString WaitTreeObjectList::GetText() const {
- if (wait_all)
- return tr("waiting for all objects");
- return tr("waiting for one of the following objects");
-}
-
-std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeObjectList::GetChildren() const {
- std::vector<std::unique_ptr<WaitTreeItem>> list(object_list.size());
- std::transform(object_list.begin(), object_list.end(), list.begin(), [this](const auto& t) {
- return WaitTreeSynchronizationObject::make(*t, system);
- });
- return list;
-}
-
WaitTreeThread::WaitTreeThread(const Kernel::KThread& thread, Core::System& system_)
: WaitTreeSynchronizationObject(thread, system_), system{system_} {}
WaitTreeThread::~WaitTreeThread() = default;
@@ -348,32 +300,14 @@ std::vector<std::unique_ptr<WaitTreeItem>> WaitTreeThread::GetChildren() const {
list.push_back(std::make_unique<WaitTreeText>(tr("processor = %1").arg(processor)));
list.push_back(std::make_unique<WaitTreeText>(
- tr("ideal core = %1").arg(thread.GetIdealCoreForDebugging())));
- list.push_back(std::make_unique<WaitTreeText>(
tr("affinity mask = %1").arg(thread.GetAffinityMask().GetAffinityMask())));
- list.push_back(std::make_unique<WaitTreeText>(tr("thread id = %1").arg(thread.GetThreadID())));
+ list.push_back(std::make_unique<WaitTreeText>(tr("thread id = %1").arg(thread.GetThreadId())));
list.push_back(std::make_unique<WaitTreeText>(tr("priority = %1(current) / %2(normal)")
.arg(thread.GetPriority())
.arg(thread.GetBasePriority())));
list.push_back(std::make_unique<WaitTreeText>(
tr("last running ticks = %1").arg(thread.GetLastScheduledTick())));
- const VAddr mutex_wait_address = thread.GetMutexWaitAddressForDebugging();
- if (mutex_wait_address != 0) {
- const auto& handle_table = thread.GetOwnerProcess()->GetHandleTable();
- list.push_back(
- std::make_unique<WaitTreeMutexInfo>(mutex_wait_address, handle_table, system));
- } else {
- list.push_back(std::make_unique<WaitTreeText>(tr("not waiting for mutex")));
- }
-
- if (thread.GetState() == Kernel::ThreadState::Waiting &&
- thread.GetWaitReasonForDebugging() ==
- Kernel::ThreadWaitReasonForDebugging::Synchronization) {
- list.push_back(std::make_unique<WaitTreeObjectList>(thread.GetWaitObjectsForDebugging(),
- thread.IsCancellable(), system));
- }
-
list.push_back(std::make_unique<WaitTreeCallstack>(thread, system));
return list;
diff --git a/src/yuzu/debugger/wait_tree.h b/src/yuzu/debugger/wait_tree.h
index 7e528b592..23c329fbe 100644
--- a/src/yuzu/debugger/wait_tree.h
+++ b/src/yuzu/debugger/wait_tree.h
@@ -74,25 +74,6 @@ public:
bool IsExpandable() const override;
};
-class WaitTreeMutexInfo : public WaitTreeExpandableItem {
- Q_OBJECT
-public:
- explicit WaitTreeMutexInfo(VAddr mutex_address_, const Kernel::KHandleTable& handle_table,
- Core::System& system_);
- ~WaitTreeMutexInfo() override;
-
- QString GetText() const override;
- std::vector<std::unique_ptr<WaitTreeItem>> GetChildren() const override;
-
-private:
- VAddr mutex_address{};
- u32 mutex_value{};
- Kernel::Handle owner_handle{};
- Kernel::KThread* owner{};
-
- Core::System& system;
-};
-
class WaitTreeCallstack : public WaitTreeExpandableItem {
Q_OBJECT
public:
@@ -127,23 +108,6 @@ private:
Core::System& system;
};
-class WaitTreeObjectList : public WaitTreeExpandableItem {
- Q_OBJECT
-public:
- WaitTreeObjectList(const std::vector<Kernel::KSynchronizationObject*>& list, bool wait_all,
- Core::System& system_);
- ~WaitTreeObjectList() override;
-
- QString GetText() const override;
- std::vector<std::unique_ptr<WaitTreeItem>> GetChildren() const override;
-
-private:
- const std::vector<Kernel::KSynchronizationObject*>& object_list;
- bool wait_all;
-
- Core::System& system;
-};
-
class WaitTreeThread : public WaitTreeSynchronizationObject {
Q_OBJECT
public:
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-31 13:23:14 +0000