All service calls in the CTR OS return result codes indicating the success or failure of the call. Previous to this commit, Citra's HLE emulation of services and the kernel universally either ignored errors or returned dummy -1 error codes. This commit makes an initial effort to provide an infrastructure for error reporting and propagation which can be use going forward to make HLE calls accurately return errors as the original system. A few parts of the code have been updated to use the new system where applicable. One part of this effort is the definition of the `ResultCode` type, which provides facilities for constructing and parsing error codes in the structured format used by the CTR. The `ResultVal` type builds on `ResultCode` by providing a container for values returned by function that can report errors. It enforces that correct error checking will be done on function returns by preventing the use of the return value if the function returned an error code. Currently this change is mostly internal since errors are still suppressed on the ARM<->HLE border, as a temporary compatibility hack. As functionality is implemented and tested this hack can be eventually removed.
172 lines
5.3 KiB
C++
172 lines
5.3 KiB
C++
// Copyright 2014 Citra Emulator Project
|
|
// Licensed under GPLv2
|
|
// Refer to the license.txt file included.
|
|
|
|
#include <map>
|
|
#include <vector>
|
|
|
|
#include "common/common.h"
|
|
|
|
#include "core/hle/kernel/kernel.h"
|
|
#include "core/hle/kernel/mutex.h"
|
|
#include "core/hle/kernel/thread.h"
|
|
|
|
namespace Kernel {
|
|
|
|
class Mutex : public Object {
|
|
public:
|
|
std::string GetTypeName() const override { return "Mutex"; }
|
|
std::string GetName() const override { return name; }
|
|
|
|
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Mutex; }
|
|
Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Mutex; }
|
|
|
|
bool initial_locked; ///< Initial lock state when mutex was created
|
|
bool locked; ///< Current locked state
|
|
Handle lock_thread; ///< Handle to thread that currently has mutex
|
|
std::vector<Handle> waiting_threads; ///< Threads that are waiting for the mutex
|
|
std::string name; ///< Name of mutex (optional)
|
|
|
|
/**
|
|
* Synchronize kernel object
|
|
* @param wait Boolean wait set if current thread should wait as a result of sync operation
|
|
* @return Result of operation, 0 on success, otherwise error code
|
|
*/
|
|
ResultVal<bool> SyncRequest() override {
|
|
// TODO(bunnei): ImplementMe
|
|
locked = true;
|
|
return MakeResult<bool>(false);
|
|
}
|
|
|
|
/**
|
|
* Wait for kernel object to synchronize
|
|
* @param wait Boolean wait set if current thread should wait as a result of sync operation
|
|
* @return Result of operation, 0 on success, otherwise error code
|
|
*/
|
|
ResultVal<bool> WaitSynchronization() override {
|
|
// TODO(bunnei): ImplementMe
|
|
bool wait = locked;
|
|
if (locked) {
|
|
Kernel::WaitCurrentThread(WAITTYPE_MUTEX, GetHandle());
|
|
}
|
|
|
|
return MakeResult<bool>(wait);
|
|
}
|
|
};
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
typedef std::multimap<Handle, Handle> MutexMap;
|
|
static MutexMap g_mutex_held_locks;
|
|
|
|
void MutexAcquireLock(Mutex* mutex, Handle thread) {
|
|
g_mutex_held_locks.insert(std::make_pair(thread, mutex->GetHandle()));
|
|
mutex->lock_thread = thread;
|
|
}
|
|
|
|
void MutexAcquireLock(Mutex* mutex) {
|
|
Handle thread = GetCurrentThreadHandle();
|
|
MutexAcquireLock(mutex, thread);
|
|
}
|
|
|
|
void MutexEraseLock(Mutex* mutex) {
|
|
Handle handle = mutex->GetHandle();
|
|
auto locked = g_mutex_held_locks.equal_range(mutex->lock_thread);
|
|
for (MutexMap::iterator iter = locked.first; iter != locked.second; ++iter) {
|
|
if ((*iter).second == handle) {
|
|
g_mutex_held_locks.erase(iter);
|
|
break;
|
|
}
|
|
}
|
|
mutex->lock_thread = -1;
|
|
}
|
|
|
|
bool LockMutex(Mutex* mutex) {
|
|
// Mutex alread locked?
|
|
if (mutex->locked) {
|
|
return false;
|
|
}
|
|
MutexAcquireLock(mutex);
|
|
return true;
|
|
}
|
|
|
|
bool ReleaseMutexForThread(Mutex* mutex, Handle thread) {
|
|
MutexAcquireLock(mutex, thread);
|
|
Kernel::ResumeThreadFromWait(thread);
|
|
return true;
|
|
}
|
|
|
|
bool ReleaseMutex(Mutex* mutex) {
|
|
MutexEraseLock(mutex);
|
|
bool woke_threads = false;
|
|
|
|
// Find the next waiting thread for the mutex...
|
|
while (!woke_threads && !mutex->waiting_threads.empty()) {
|
|
std::vector<Handle>::iterator iter = mutex->waiting_threads.begin();
|
|
woke_threads |= ReleaseMutexForThread(mutex, *iter);
|
|
mutex->waiting_threads.erase(iter);
|
|
}
|
|
// Reset mutex lock thread handle, nothing is waiting
|
|
if (!woke_threads) {
|
|
mutex->locked = false;
|
|
mutex->lock_thread = -1;
|
|
}
|
|
return woke_threads;
|
|
}
|
|
|
|
/**
|
|
* Releases a mutex
|
|
* @param handle Handle to mutex to release
|
|
*/
|
|
ResultCode ReleaseMutex(Handle handle) {
|
|
Mutex* mutex = Kernel::g_object_pool.Get<Mutex>(handle);
|
|
if (mutex == nullptr) return InvalidHandle(ErrorModule::Kernel);
|
|
|
|
if (!ReleaseMutex(mutex)) {
|
|
// TODO(yuriks): Verify error code, this one was pulled out of thin air. I'm not even sure
|
|
// what error condition this is supposed to be signaling.
|
|
return ResultCode(ErrorDescription::AlreadyDone, ErrorModule::Kernel,
|
|
ErrorSummary::NothingHappened, ErrorLevel::Temporary);
|
|
}
|
|
return RESULT_SUCCESS;
|
|
}
|
|
|
|
/**
|
|
* Creates a mutex
|
|
* @param handle Reference to handle for the newly created mutex
|
|
* @param initial_locked Specifies if the mutex should be locked initially
|
|
* @param name Optional name of mutex
|
|
* @return Pointer to new Mutex object
|
|
*/
|
|
Mutex* CreateMutex(Handle& handle, bool initial_locked, const std::string& name) {
|
|
Mutex* mutex = new Mutex;
|
|
handle = Kernel::g_object_pool.Create(mutex);
|
|
|
|
mutex->locked = mutex->initial_locked = initial_locked;
|
|
mutex->name = name;
|
|
|
|
// Acquire mutex with current thread if initialized as locked...
|
|
if (mutex->locked) {
|
|
MutexAcquireLock(mutex);
|
|
|
|
// Otherwise, reset lock thread handle
|
|
} else {
|
|
mutex->lock_thread = -1;
|
|
}
|
|
return mutex;
|
|
}
|
|
|
|
/**
|
|
* Creates a mutex
|
|
* @param initial_locked Specifies if the mutex should be locked initially
|
|
* @param name Optional name of mutex
|
|
* @return Handle to newly created object
|
|
*/
|
|
Handle CreateMutex(bool initial_locked, const std::string& name) {
|
|
Handle handle;
|
|
Mutex* mutex = CreateMutex(handle, initial_locked, name);
|
|
return handle;
|
|
}
|
|
|
|
} // namespace
|