mirror of
https://github.com/yuzu-emu/yuzu.git
synced 2024-07-04 23:31:19 +01:00
hle: kernel: thread: Remove unused "Running" state.
This commit is contained in:
parent
63fd1bb503
commit
c2ad1243ba
3 changed files with 9 additions and 21 deletions
|
@ -88,10 +88,6 @@ void Thread::ResumeFromWait() {
|
||||||
// before actually resuming. We can ignore subsequent wakeups if the thread status has
|
// before actually resuming. We can ignore subsequent wakeups if the thread status has
|
||||||
// already been set to ThreadStatus::Ready.
|
// already been set to ThreadStatus::Ready.
|
||||||
return;
|
return;
|
||||||
|
|
||||||
case ThreadStatus::Running:
|
|
||||||
DEBUG_ASSERT_MSG(false, "Thread with object id {} has already resumed.", GetObjectId());
|
|
||||||
return;
|
|
||||||
case ThreadStatus::Dead:
|
case ThreadStatus::Dead:
|
||||||
// This should never happen, as threads must complete before being stopped.
|
// This should never happen, as threads must complete before being stopped.
|
||||||
DEBUG_ASSERT_MSG(false, "Thread with object id {} cannot be resumed because it's DEAD.",
|
DEBUG_ASSERT_MSG(false, "Thread with object id {} cannot be resumed because it's DEAD.",
|
||||||
|
@ -260,7 +256,6 @@ void Thread::SetStatus(ThreadStatus new_status) {
|
||||||
|
|
||||||
switch (new_status) {
|
switch (new_status) {
|
||||||
case ThreadStatus::Ready:
|
case ThreadStatus::Ready:
|
||||||
case ThreadStatus::Running:
|
|
||||||
SetSchedulingStatus(ThreadSchedStatus::Runnable);
|
SetSchedulingStatus(ThreadSchedStatus::Runnable);
|
||||||
break;
|
break;
|
||||||
case ThreadStatus::Dormant:
|
case ThreadStatus::Dormant:
|
||||||
|
|
|
@ -72,7 +72,6 @@ enum ThreadProcessorId : s32 {
|
||||||
};
|
};
|
||||||
|
|
||||||
enum class ThreadStatus {
|
enum class ThreadStatus {
|
||||||
Running, ///< Currently running
|
|
||||||
Ready, ///< Ready to run
|
Ready, ///< Ready to run
|
||||||
Paused, ///< Paused by SetThreadActivity or debug
|
Paused, ///< Paused by SetThreadActivity or debug
|
||||||
WaitHLEEvent, ///< Waiting for hle event to finish
|
WaitHLEEvent, ///< Waiting for hle event to finish
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
namespace {
|
namespace {
|
||||||
|
|
||||||
constexpr std::array<std::array<Qt::GlobalColor, 2>, 10> WaitTreeColors{{
|
constexpr std::array<std::array<Qt::GlobalColor, 2>, 10> WaitTreeColors{{
|
||||||
{Qt::GlobalColor::darkGreen, Qt::GlobalColor::green},
|
|
||||||
{Qt::GlobalColor::darkGreen, Qt::GlobalColor::green},
|
{Qt::GlobalColor::darkGreen, Qt::GlobalColor::green},
|
||||||
{Qt::GlobalColor::darkBlue, Qt::GlobalColor::cyan},
|
{Qt::GlobalColor::darkBlue, Qt::GlobalColor::cyan},
|
||||||
{Qt::GlobalColor::lightGray, Qt::GlobalColor::lightGray},
|
{Qt::GlobalColor::lightGray, Qt::GlobalColor::lightGray},
|
||||||
|
@ -239,9 +238,6 @@ QString WaitTreeThread::GetText() const {
|
||||||
const auto& thread = static_cast<const Kernel::Thread&>(object);
|
const auto& thread = static_cast<const Kernel::Thread&>(object);
|
||||||
QString status;
|
QString status;
|
||||||
switch (thread.GetStatus()) {
|
switch (thread.GetStatus()) {
|
||||||
case Kernel::ThreadStatus::Running:
|
|
||||||
status = tr("running");
|
|
||||||
break;
|
|
||||||
case Kernel::ThreadStatus::Ready:
|
case Kernel::ThreadStatus::Ready:
|
||||||
if (!thread.IsPaused()) {
|
if (!thread.IsPaused()) {
|
||||||
if (thread.WasRunning()) {
|
if (thread.WasRunning()) {
|
||||||
|
@ -298,34 +294,32 @@ QColor WaitTreeThread::GetColor() const {
|
||||||
|
|
||||||
const auto& thread = static_cast<const Kernel::Thread&>(object);
|
const auto& thread = static_cast<const Kernel::Thread&>(object);
|
||||||
switch (thread.GetStatus()) {
|
switch (thread.GetStatus()) {
|
||||||
case Kernel::ThreadStatus::Running:
|
|
||||||
return QColor(WaitTreeColors[0][color_index]);
|
|
||||||
case Kernel::ThreadStatus::Ready:
|
case Kernel::ThreadStatus::Ready:
|
||||||
if (!thread.IsPaused()) {
|
if (!thread.IsPaused()) {
|
||||||
if (thread.WasRunning()) {
|
if (thread.WasRunning()) {
|
||||||
return QColor(WaitTreeColors[1][color_index]);
|
return QColor(WaitTreeColors[0][color_index]);
|
||||||
} else {
|
} else {
|
||||||
return QColor(WaitTreeColors[2][color_index]);
|
return QColor(WaitTreeColors[1][color_index]);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
return QColor(WaitTreeColors[3][color_index]);
|
return QColor(WaitTreeColors[2][color_index]);
|
||||||
}
|
}
|
||||||
case Kernel::ThreadStatus::Paused:
|
case Kernel::ThreadStatus::Paused:
|
||||||
return QColor(WaitTreeColors[4][color_index]);
|
return QColor(WaitTreeColors[3][color_index]);
|
||||||
case Kernel::ThreadStatus::WaitHLEEvent:
|
case Kernel::ThreadStatus::WaitHLEEvent:
|
||||||
case Kernel::ThreadStatus::WaitIPC:
|
case Kernel::ThreadStatus::WaitIPC:
|
||||||
return QColor(WaitTreeColors[5][color_index]);
|
return QColor(WaitTreeColors[4][color_index]);
|
||||||
case Kernel::ThreadStatus::WaitSleep:
|
case Kernel::ThreadStatus::WaitSleep:
|
||||||
return QColor(WaitTreeColors[6][color_index]);
|
return QColor(WaitTreeColors[5][color_index]);
|
||||||
case Kernel::ThreadStatus::WaitSynch:
|
case Kernel::ThreadStatus::WaitSynch:
|
||||||
case Kernel::ThreadStatus::WaitMutex:
|
case Kernel::ThreadStatus::WaitMutex:
|
||||||
case Kernel::ThreadStatus::WaitCondVar:
|
case Kernel::ThreadStatus::WaitCondVar:
|
||||||
case Kernel::ThreadStatus::WaitArb:
|
case Kernel::ThreadStatus::WaitArb:
|
||||||
return QColor(WaitTreeColors[7][color_index]);
|
return QColor(WaitTreeColors[6][color_index]);
|
||||||
case Kernel::ThreadStatus::Dormant:
|
case Kernel::ThreadStatus::Dormant:
|
||||||
return QColor(WaitTreeColors[8][color_index]);
|
return QColor(WaitTreeColors[7][color_index]);
|
||||||
case Kernel::ThreadStatus::Dead:
|
case Kernel::ThreadStatus::Dead:
|
||||||
return QColor(WaitTreeColors[9][color_index]);
|
return QColor(WaitTreeColors[8][color_index]);
|
||||||
default:
|
default:
|
||||||
return WaitTreeItem::GetColor();
|
return WaitTreeItem::GetColor();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue