|
|
|
@ -2,8 +2,6 @@
|
|
|
|
|
// Licensed under GPLv2 or any later version
|
|
|
|
|
// Refer to the license.txt file included.
|
|
|
|
|
|
|
|
|
|
#include <queue>
|
|
|
|
|
|
|
|
|
|
#include "common/common.h"
|
|
|
|
|
|
|
|
|
|
#include "core/hle/kernel/kernel.h"
|
|
|
|
@ -12,69 +10,50 @@
|
|
|
|
|
|
|
|
|
|
namespace Kernel {
|
|
|
|
|
|
|
|
|
|
class Semaphore : public WaitObject {
|
|
|
|
|
public:
|
|
|
|
|
std::string GetTypeName() const override { return "Semaphore"; }
|
|
|
|
|
std::string GetName() const override { return name; }
|
|
|
|
|
|
|
|
|
|
static const HandleType HANDLE_TYPE = HandleType::Semaphore;
|
|
|
|
|
HandleType GetHandleType() const override { return HANDLE_TYPE; }
|
|
|
|
|
|
|
|
|
|
s32 max_count; ///< Maximum number of simultaneous holders the semaphore can have
|
|
|
|
|
s32 available_count; ///< Number of free slots left in the semaphore
|
|
|
|
|
std::string name; ///< Name of semaphore (optional)
|
|
|
|
|
|
|
|
|
|
bool ShouldWait() override {
|
|
|
|
|
return available_count <= 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Acquire() override {
|
|
|
|
|
_assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
|
|
|
|
|
--available_count;
|
|
|
|
|
}
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
////////////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
|
|
|
|
|
|
ResultCode CreateSemaphore(Handle* handle, s32 initial_count,
|
|
|
|
|
s32 max_count, const std::string& name) {
|
|
|
|
|
ResultVal<SharedPtr<Semaphore>> Semaphore::Create(s32 initial_count, s32 max_count,
|
|
|
|
|
std::string name) {
|
|
|
|
|
|
|
|
|
|
if (initial_count > max_count)
|
|
|
|
|
return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::Kernel,
|
|
|
|
|
ErrorSummary::WrongArgument, ErrorLevel::Permanent);
|
|
|
|
|
|
|
|
|
|
Semaphore* semaphore = new Semaphore;
|
|
|
|
|
// TOOD(yuriks): Fix error reporting
|
|
|
|
|
*handle = g_handle_table.Create(semaphore).ValueOr(INVALID_HANDLE);
|
|
|
|
|
SharedPtr<Semaphore> semaphore(new Semaphore);
|
|
|
|
|
// TOOD(yuriks): Don't create Handle (see Thread::Create())
|
|
|
|
|
CASCADE_RESULT(auto unused, Kernel::g_handle_table.Create(semaphore));
|
|
|
|
|
|
|
|
|
|
// When the semaphore is created, some slots are reserved for other threads,
|
|
|
|
|
// and the rest is reserved for the caller thread
|
|
|
|
|
semaphore->max_count = max_count;
|
|
|
|
|
semaphore->available_count = initial_count;
|
|
|
|
|
semaphore->name = name;
|
|
|
|
|
semaphore->name = std::move(name);
|
|
|
|
|
|
|
|
|
|
return RESULT_SUCCESS;
|
|
|
|
|
return MakeResult<SharedPtr<Semaphore>>(std::move(semaphore));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count) {
|
|
|
|
|
Semaphore* semaphore = g_handle_table.Get<Semaphore>(handle).get();
|
|
|
|
|
if (semaphore == nullptr)
|
|
|
|
|
return InvalidHandle(ErrorModule::Kernel);
|
|
|
|
|
bool Semaphore::ShouldWait() {
|
|
|
|
|
return available_count <= 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (semaphore->max_count - semaphore->available_count < release_count)
|
|
|
|
|
void Semaphore::Acquire() {
|
|
|
|
|
_assert_msg_(Kernel, !ShouldWait(), "object unavailable!");
|
|
|
|
|
--available_count;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
ResultVal<s32> Semaphore::Release(s32 release_count) {
|
|
|
|
|
if (max_count - available_count < release_count)
|
|
|
|
|
return ResultCode(ErrorDescription::OutOfRange, ErrorModule::Kernel,
|
|
|
|
|
ErrorSummary::InvalidArgument, ErrorLevel::Permanent);
|
|
|
|
|
|
|
|
|
|
*count = semaphore->available_count;
|
|
|
|
|
semaphore->available_count += release_count;
|
|
|
|
|
s32 previous_count = available_count;
|
|
|
|
|
available_count += release_count;
|
|
|
|
|
|
|
|
|
|
// Notify some of the threads that the semaphore has been released
|
|
|
|
|
// stop once the semaphore is full again or there are no more waiting threads
|
|
|
|
|
while (!semaphore->ShouldWait() && semaphore->WakeupNextThread() != nullptr) {
|
|
|
|
|
semaphore->Acquire();
|
|
|
|
|
while (!ShouldWait() && WakeupNextThread() != nullptr) {
|
|
|
|
|
Acquire();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return RESULT_SUCCESS;
|
|
|
|
|
return MakeResult<s32>(previous_count);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|