summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/hle/kernel/semaphore.cpp41
-rw-r--r--src/core/hle/kernel/semaphore.h9
2 files changed, 18 insertions, 32 deletions
diff --git a/src/core/hle/kernel/semaphore.cpp b/src/core/hle/kernel/semaphore.cpp
index 216c97835..f7a895c3f 100644
--- a/src/core/hle/kernel/semaphore.cpp
+++ b/src/core/hle/kernel/semaphore.cpp
@@ -27,11 +27,11 @@ public:
std::string name; ///< Name of semaphore (optional)
/**
- * Tests whether a semaphore is at its peak capacity
- * @return Whether the semaphore is full
+ * Tests whether a semaphore still has free slots
+ * @return Whether the semaphore is available
*/
- bool IsFull() const {
- return current_usage == max_count;
+ bool IsAvailable() const {
+ return current_usage < max_count;
}
ResultVal<bool> WaitSynchronization() override {
@@ -50,42 +50,27 @@ public:
////////////////////////////////////////////////////////////////////////////////////////////////////
-/**
- * Creates a semaphore
- * @param initial_count number of slots reserved for other threads
- * @param max_count maximum number of holders the semaphore can have
- * @param name Optional name of semaphore
- * @return Handle for the newly created semaphore
- */
-Handle CreateSemaphore(u32 initial_count,
+ResultCode CreateSemaphore(Handle* handle, u32 initial_count,
u32 max_count, const std::string& name) {
+ if (initial_count > max_count)
+ return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::Kernel,
+ ErrorSummary::WrongArgument, ErrorLevel::Permanent);
+
Semaphore* semaphore = new Semaphore;
- Handle handle = g_object_pool.Create(semaphore);
+ *handle = g_object_pool.Create(semaphore);
semaphore->initial_count = initial_count;
// When the semaphore is created, some slots are reserved for other threads,
// and the rest is reserved for the caller thread
- semaphore->max_count = semaphore->current_usage = max_count;
- semaphore->current_usage -= initial_count;
+ semaphore->max_count = max_count;
+ semaphore->current_usage = max_count - initial_count;
semaphore->name = name;
- return handle;
-}
-
-ResultCode CreateSemaphore(Handle* handle, u32 initial_count,
- u32 max_count, const std::string& name) {
-
- if (initial_count > max_count)
- return ResultCode(ErrorDescription::InvalidCombination, ErrorModule::Kernel,
- ErrorSummary::WrongArgument, ErrorLevel::Permanent);
- *handle = CreateSemaphore(initial_count, max_count, name);
-
return RESULT_SUCCESS;
}
ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count) {
-
Semaphore* semaphore = g_object_pool.Get<Semaphore>(handle);
if (semaphore == nullptr)
return InvalidHandle(ErrorModule::Kernel);
@@ -99,7 +84,7 @@ ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 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->waiting_threads.empty() && !semaphore->IsFull()) {
+ while (!semaphore->waiting_threads.empty() && semaphore->IsAvailable()) {
Kernel::ResumeThreadFromWait(semaphore->waiting_threads.front());
semaphore->waiting_threads.pop();
semaphore->current_usage++;
diff --git a/src/core/hle/kernel/semaphore.h b/src/core/hle/kernel/semaphore.h
index b29812e1d..f0075fdb8 100644
--- a/src/core/hle/kernel/semaphore.h
+++ b/src/core/hle/kernel/semaphore.h
@@ -11,21 +11,22 @@
namespace Kernel {
/**
- * Creates a semaphore
+ * Creates a semaphore.
* @param handle Pointer to the handle of the newly created object
- * @param initial_count number of slots reserved for other threads
- * @param max_count maximum number of slots the semaphore can have
+ * @param initial_count Number of slots reserved for other threads
+ * @param max_count Maximum number of slots the semaphore can have
* @param name Optional name of semaphore
* @return ResultCode of the error
*/
ResultCode CreateSemaphore(Handle* handle, u32 initial_count, u32 max_count, const std::string& name = "Unknown");
/**
- * Releases a certain number of slots from a semaphore
+ * Releases a certain number of slots from a semaphore.
* @param count The number of free slots the semaphore had before this call
* @param handle The handle of the semaphore to release
* @param release_count The number of slots to release
* @return ResultCode of the error
*/
ResultCode ReleaseSemaphore(s32* count, Handle handle, s32 release_count);
+
} // namespace