citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

Semaphore: Implemented the initial_count parameter.

This commit is contained in:
Subv 2014-12-04 11:55:13 -05:00
parent 49b31badba
commit abff4a7ee2
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/hle/kernel/semaphore.cpp
View File

@ -20,7 +20,7 @@ public:
static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Semaphore; } static Kernel::HandleType GetStaticHandleType() { return Kernel::HandleType::Semaphore; }
Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Semaphore; } Kernel::HandleType GetHandleType() const override { return Kernel::HandleType::Semaphore; }
u32 initial_count; ///< Number of reserved entries TODO(Subv): Make use of this u32 initial_count; ///< Number of entries reserved for other threads
u32 max_count; ///< Maximum number of simultaneous holders the semaphore can have u32 max_count; ///< Maximum number of simultaneous holders the semaphore can have
u32 current_usage; ///< Number of currently used entries in the semaphore u32 current_usage; ///< Number of currently used entries in the semaphore
std::queue<Handle> waiting_threads; ///< Threads that are waiting for the semaphore std::queue<Handle> waiting_threads; ///< Threads that are waiting for the semaphore
@ -58,7 +58,7 @@ public:
/** /**
* Creates a semaphore * Creates a semaphore
* @param handle Reference to handle for the newly created semaphore * @param handle Reference to handle for the newly created semaphore
* @param initial_count initial amount of times the semaphore is held * @param initial_count number of slots reserved for other threads
* @param max_count maximum number of holders the semaphore can have * @param max_count maximum number of holders the semaphore can have
* @param name Optional name of semaphore * @param name Optional name of semaphore
* @return Pointer to new Semaphore object * @return Pointer to new Semaphore object
@ -70,8 +70,10 @@ Semaphore* CreateSemaphore(Handle& handle, u32 initial_count,
handle = g_object_pool.Create(semaphore); handle = g_object_pool.Create(semaphore);
semaphore->initial_count = initial_count; semaphore->initial_count = initial_count;
// When the semaphore is created, all slots are used by the creator thread // 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->max_count = semaphore->current_usage = max_count;
semaphore->current_usage -= initial_count;
semaphore->name = name; semaphore->name = name;
return semaphore; return semaphore;

4
src/core/hle/kernel/semaphore.h
View File

@ -13,8 +13,8 @@ namespace Kernel {
/** /**
* Creates a semaphore * Creates a semaphore
* @param handle Pointer to the handle of the newly created object * @param handle Pointer to the handle of the newly created object
* @param initial_count number of reserved entries in the semaphore * @param initial_count number of slots reserved for other threads
* @param max_count maximum number of holders the semaphore can have * @param max_count maximum number of slots the semaphore can have
* @param name Optional name of semaphore * @param name Optional name of semaphore
* @return ResultCode of the error * @return ResultCode of the error
*/ */