Merge pull request #242 from bunnei/fix-address-arbiters
Thread: Fixed to wait on address when in arbitration.
This commit is contained in:
commit
3a57856b66
3 changed files with 31 additions and 11 deletions
src/core/hle/kernel
|
@ -53,7 +53,7 @@ ResultCode ArbitrateAddress(Handle handle, ArbitrationType type, u32 address, s3
|
|||
// Wait current thread (acquire the arbiter)...
|
||||
case ArbitrationType::WaitIfLessThan:
|
||||
if ((s32)Memory::Read32(address) <= value) {
|
||||
Kernel::WaitCurrentThread(WAITTYPE_ARB, handle);
|
||||
Kernel::WaitCurrentThread(WAITTYPE_ARB, handle, address);
|
||||
HLE::Reschedule(__func__);
|
||||
}
|
||||
break;
|
||||
|
|
|
@ -63,6 +63,7 @@ public:
|
|||
|
||||
WaitType wait_type;
|
||||
Handle wait_handle;
|
||||
VAddr wait_address;
|
||||
|
||||
std::vector<Handle> waiting_threads;
|
||||
|
||||
|
@ -126,6 +127,7 @@ void ResetThread(Thread* t, u32 arg, s32 lowest_priority) {
|
|||
}
|
||||
t->wait_type = WAITTYPE_NONE;
|
||||
t->wait_handle = 0;
|
||||
t->wait_address = 0;
|
||||
}
|
||||
|
||||
/// Change a thread to "ready" state
|
||||
|
@ -146,11 +148,17 @@ void ChangeReadyState(Thread* t, bool ready) {
|
|||
}
|
||||
|
||||
/// Verify that a thread has not been released from waiting
|
||||
inline bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) {
|
||||
static bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle) {
|
||||
_dbg_assert_(KERNEL, thread != nullptr);
|
||||
return (type == thread->wait_type) && (wait_handle == thread->wait_handle) && (thread->IsWaiting());
|
||||
}
|
||||
|
||||
/// Verify that a thread has not been released from waiting (with wait address)
|
||||
static bool VerifyWait(const Thread* thread, WaitType type, Handle wait_handle, VAddr wait_address) {
|
||||
_dbg_assert_(KERNEL, thread != nullptr);
|
||||
return VerifyWait(thread, type, wait_handle) && (wait_address == thread->wait_address);
|
||||
}
|
||||
|
||||
/// Stops the current thread
|
||||
ResultCode StopThread(Handle handle, const char* reason) {
|
||||
Thread* thread = g_object_pool.Get<Thread>(handle);
|
||||
|
@ -169,6 +177,7 @@ ResultCode StopThread(Handle handle, const char* reason) {
|
|||
// Stopped threads are never waiting.
|
||||
thread->wait_type = WAITTYPE_NONE;
|
||||
thread->wait_handle = 0;
|
||||
thread->wait_address = 0;
|
||||
|
||||
return RESULT_SUCCESS;
|
||||
}
|
||||
|
@ -197,12 +206,12 @@ Handle ArbitrateHighestPriorityThread(u32 arbiter, u32 address) {
|
|||
for (Handle handle : thread_queue) {
|
||||
Thread* thread = g_object_pool.Get<Thread>(handle);
|
||||
|
||||
// TODO(bunnei): Verify arbiter address...
|
||||
if (!VerifyWait(thread, WAITTYPE_ARB, arbiter))
|
||||
if (!VerifyWait(thread, WAITTYPE_ARB, arbiter, address))
|
||||
continue;
|
||||
|
||||
if (thread == nullptr)
|
||||
continue; // TODO(yuriks): Thread handle will hang around forever. Should clean up.
|
||||
|
||||
if(thread->current_priority <= priority) {
|
||||
highest_priority_thread = handle;
|
||||
priority = thread->current_priority;
|
||||
|
@ -222,8 +231,7 @@ void ArbitrateAllThreads(u32 arbiter, u32 address) {
|
|||
for (Handle handle : thread_queue) {
|
||||
Thread* thread = g_object_pool.Get<Thread>(handle);
|
||||
|
||||
// TODO(bunnei): Verify arbiter address...
|
||||
if (VerifyWait(thread, WAITTYPE_ARB, arbiter))
|
||||
if (VerifyWait(thread, WAITTYPE_ARB, arbiter, address))
|
||||
ResumeThreadFromWait(handle);
|
||||
}
|
||||
}
|
||||
|
@ -277,11 +285,6 @@ Thread* NextThread() {
|
|||
return Kernel::g_object_pool.Get<Thread>(next);
|
||||
}
|
||||
|
||||
/**
|
||||
* Puts the current thread in the wait state for the given type
|
||||
* @param wait_type Type of wait
|
||||
* @param wait_handle Handle of Kernel object that we are waiting on, defaults to current thread
|
||||
*/
|
||||
void WaitCurrentThread(WaitType wait_type, Handle wait_handle) {
|
||||
Thread* thread = GetCurrentThread();
|
||||
thread->wait_type = wait_type;
|
||||
|
@ -289,6 +292,11 @@ void WaitCurrentThread(WaitType wait_type, Handle wait_handle) {
|
|||
ChangeThreadState(thread, ThreadStatus(THREADSTATUS_WAIT | (thread->status & THREADSTATUS_SUSPEND)));
|
||||
}
|
||||
|
||||
void WaitCurrentThread(WaitType wait_type, Handle wait_handle, VAddr wait_address) {
|
||||
WaitCurrentThread(wait_type, wait_handle);
|
||||
GetCurrentThread()->wait_address = wait_address;
|
||||
}
|
||||
|
||||
/// Resumes a thread from waiting by marking it as "ready"
|
||||
void ResumeThreadFromWait(Handle handle) {
|
||||
Thread* thread = Kernel::g_object_pool.Get<Thread>(handle);
|
||||
|
@ -339,6 +347,7 @@ Thread* CreateThread(Handle& handle, const char* name, u32 entry_point, s32 prio
|
|||
thread->processor_id = processor_id;
|
||||
thread->wait_type = WAITTYPE_NONE;
|
||||
thread->wait_handle = 0;
|
||||
thread->wait_address = 0;
|
||||
thread->name = name;
|
||||
|
||||
return thread;
|
||||
|
|
|
@ -5,6 +5,9 @@
|
|||
#pragma once
|
||||
|
||||
#include "common/common_types.h"
|
||||
|
||||
#include "core/mem_map.h"
|
||||
|
||||
#include "core/hle/kernel/kernel.h"
|
||||
#include "core/hle/result.h"
|
||||
|
||||
|
@ -85,6 +88,14 @@ Handle GetCurrentThreadHandle();
|
|||
*/
|
||||
void WaitCurrentThread(WaitType wait_type, Handle wait_handle=GetCurrentThreadHandle());
|
||||
|
||||
/**
|
||||
* Puts the current thread in the wait state for the given type
|
||||
* @param wait_type Type of wait
|
||||
* @param wait_handle Handle of Kernel object that we are waiting on, defaults to current thread
|
||||
* @param wait_address Arbitration address used to resume from wait
|
||||
*/
|
||||
void WaitCurrentThread(WaitType wait_type, Handle wait_handle, VAddr wait_address);
|
||||
|
||||
/// Put current thread in a wait state - on WaitSynchronization
|
||||
void WaitThread_Synchronization();
|
||||
|
||||
|
|
Loading…
Reference in a new issue