diff options
| author | bunnei <bunneidev@gmail.com> | 2015-01-14 23:19:22 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-01-21 18:41:58 -0500 |
| commit | 5e77e2e1de73ce7786f52f2a74c28182fa4aa845 (patch) | |
| tree | d874f351cd8bc11757d50deba4fea1abefd323d2 /src/core/hle/kernel/kernel.cpp | |
| parent | c22bac6398ff1705992fc44b2c29775c84cff662 (diff) | |
WaitObject: Added RemoveWaitingThread, fixed a bug, and cleanup.
Diffstat (limited to 'src/core/hle/kernel/kernel.cpp')
| -rw-r--r-- | src/core/hle/kernel/kernel.cpp | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/hle/kernel/kernel.cpp b/src/core/hle/kernel/kernel.cpp index 07e96e633b..1dba85939e 100644 --- a/src/core/hle/kernel/kernel.cpp +++ b/src/core/hle/kernel/kernel.cpp @@ -19,13 +19,20 @@ HandleTable g_handle_table; u64 g_program_id = 0; void WaitObject::AddWaitingThread(Thread* thread) { - if (std::find(waiting_threads.begin(), waiting_threads.end(), thread) == waiting_threads.end()) { + auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread); + if (itr == waiting_threads.end()) waiting_threads.push_back(thread); - } +} + +void WaitObject::RemoveWaitingThread(Thread* thread) { + auto itr = std::find(waiting_threads.begin(), waiting_threads.end(), thread); + if (itr != waiting_threads.end()) + waiting_threads.erase(itr); } Thread* WaitObject::ResumeNextThread() { - if (waiting_threads.empty()) return nullptr; + if (waiting_threads.empty()) + return nullptr; auto next_thread = waiting_threads.front(); |