commit
848795f383
|
@ -21,7 +21,7 @@ namespace Kernel {
|
||||||
*/
|
*/
|
||||||
static void ResumeWaitingThread(Mutex* mutex) {
|
static void ResumeWaitingThread(Mutex* mutex) {
|
||||||
// Reset mutex lock thread handle, nothing is waiting
|
// Reset mutex lock thread handle, nothing is waiting
|
||||||
mutex->locked = false;
|
mutex->lock_count = 0;
|
||||||
mutex->holding_thread = nullptr;
|
mutex->holding_thread = nullptr;
|
||||||
|
|
||||||
// Find the next waiting thread for the mutex...
|
// Find the next waiting thread for the mutex...
|
||||||
|
@ -44,8 +44,7 @@ Mutex::~Mutex() {}
|
||||||
SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) {
|
SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) {
|
||||||
SharedPtr<Mutex> mutex(new Mutex);
|
SharedPtr<Mutex> mutex(new Mutex);
|
||||||
|
|
||||||
mutex->initial_locked = initial_locked;
|
mutex->lock_count = 0;
|
||||||
mutex->locked = false;
|
|
||||||
mutex->name = std::move(name);
|
mutex->name = std::move(name);
|
||||||
mutex->holding_thread = nullptr;
|
mutex->holding_thread = nullptr;
|
||||||
|
|
||||||
|
@ -57,7 +56,7 @@ SharedPtr<Mutex> Mutex::Create(bool initial_locked, std::string name) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Mutex::ShouldWait() {
|
bool Mutex::ShouldWait() {
|
||||||
return locked && holding_thread != GetCurrentThread();
|
return lock_count > 0 && holding_thread != GetCurrentThread();;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mutex::Acquire() {
|
void Mutex::Acquire() {
|
||||||
|
@ -66,21 +65,27 @@ void Mutex::Acquire() {
|
||||||
|
|
||||||
void Mutex::Acquire(SharedPtr<Thread> thread) {
|
void Mutex::Acquire(SharedPtr<Thread> thread) {
|
||||||
_assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
|
_assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
|
||||||
if (locked)
|
|
||||||
return;
|
|
||||||
|
|
||||||
locked = true;
|
// Actually "acquire" the mutex only if we don't already have it...
|
||||||
|
if (lock_count == 0) {
|
||||||
|
thread->held_mutexes.insert(this);
|
||||||
|
holding_thread = std::move(thread);
|
||||||
|
}
|
||||||
|
|
||||||
thread->held_mutexes.insert(this);
|
lock_count++;
|
||||||
holding_thread = std::move(thread);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void Mutex::Release() {
|
void Mutex::Release() {
|
||||||
if (!locked)
|
// Only release if the mutex is held...
|
||||||
return;
|
if (lock_count > 0) {
|
||||||
|
lock_count--;
|
||||||
|
|
||||||
holding_thread->held_mutexes.erase(this);
|
// Yield to the next thread only if we've fully released the mutex...
|
||||||
ResumeWaitingThread(this);
|
if (lock_count == 0) {
|
||||||
|
holding_thread->held_mutexes.erase(this);
|
||||||
|
ResumeWaitingThread(this);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
|
@ -30,8 +30,7 @@ public:
|
||||||
static const HandleType HANDLE_TYPE = HandleType::Mutex;
|
static const HandleType HANDLE_TYPE = HandleType::Mutex;
|
||||||
HandleType GetHandleType() const override { return HANDLE_TYPE; }
|
HandleType GetHandleType() const override { return HANDLE_TYPE; }
|
||||||
|
|
||||||
bool initial_locked; ///< Initial lock state when mutex was created
|
int lock_count; ///< Number of times the mutex has been acquired
|
||||||
bool locked; ///< Current locked state
|
|
||||||
std::string name; ///< Name of mutex (optional)
|
std::string name; ///< Name of mutex (optional)
|
||||||
SharedPtr<Thread> holding_thread; ///< Thread that has acquired the mutex
|
SharedPtr<Thread> holding_thread; ///< Thread that has acquired the mutex
|
||||||
|
|
||||||
|
|
|
@ -144,6 +144,8 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) {
|
||||||
LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle,
|
LOG_TRACE(Kernel_SVC, "called handle=0x%08X(%s:%s), nanoseconds=%lld", handle,
|
||||||
object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds);
|
object->GetTypeName().c_str(), object->GetName().c_str(), nano_seconds);
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
|
|
||||||
// Check for next thread to schedule
|
// Check for next thread to schedule
|
||||||
if (object->ShouldWait()) {
|
if (object->ShouldWait()) {
|
||||||
|
|
||||||
|
@ -153,8 +155,6 @@ static ResultCode WaitSynchronization1(Handle handle, s64 nano_seconds) {
|
||||||
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
||||||
Kernel::GetCurrentThread()->WakeAfterDelay(nano_seconds);
|
Kernel::GetCurrentThread()->WakeAfterDelay(nano_seconds);
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
// NOTE: output of this SVC will be set later depending on how the thread resumes
|
// NOTE: output of this SVC will be set later depending on how the thread resumes
|
||||||
return RESULT_INVALID;
|
return RESULT_INVALID;
|
||||||
}
|
}
|
||||||
|
@ -216,6 +216,8 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HLE::Reschedule(__func__);
|
||||||
|
|
||||||
// If thread should wait, then set its state to waiting and then reschedule...
|
// If thread should wait, then set its state to waiting and then reschedule...
|
||||||
if (wait_thread) {
|
if (wait_thread) {
|
||||||
|
|
||||||
|
@ -229,8 +231,6 @@ static ResultCode WaitSynchronizationN(s32* out, Handle* handles, s32 handle_cou
|
||||||
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
// Create an event to wake the thread up after the specified nanosecond delay has passed
|
||||||
Kernel::GetCurrentThread()->WakeAfterDelay(nano_seconds);
|
Kernel::GetCurrentThread()->WakeAfterDelay(nano_seconds);
|
||||||
|
|
||||||
HLE::Reschedule(__func__);
|
|
||||||
|
|
||||||
// NOTE: output of this SVC will be set later depending on how the thread resumes
|
// NOTE: output of this SVC will be set later depending on how the thread resumes
|
||||||
return RESULT_INVALID;
|
return RESULT_INVALID;
|
||||||
}
|
}
|
||||||
|
|
Reference in New Issue