os: adopt multiwait naming over waitable
This commit is contained in:
@@ -15,8 +15,8 @@
|
||||
*/
|
||||
#include <stratosphere.hpp>
|
||||
#include "impl/os_timeout_helper.hpp"
|
||||
#include "impl/os_waitable_object_list.hpp"
|
||||
#include "impl/os_waitable_holder_impl.hpp"
|
||||
#include "impl/os_multiple_wait_object_list.hpp"
|
||||
#include "impl/os_multiple_wait_holder_impl.hpp"
|
||||
|
||||
namespace ams::os {
|
||||
|
||||
@@ -40,8 +40,8 @@ namespace ams::os {
|
||||
util::ConstructAt(event->cs_event);
|
||||
util::ConstructAt(event->cv_signaled);
|
||||
|
||||
/* Initialize the waitable object list. */
|
||||
util::ConstructAt(event->waitable_object_list_storage);
|
||||
/* Initialize the multi wait object list. */
|
||||
util::ConstructAt(event->multi_wait_object_list_storage);
|
||||
|
||||
/* Initialize member variables. */
|
||||
event->signaled = signaled;
|
||||
@@ -61,7 +61,7 @@ namespace ams::os {
|
||||
event->state = EventType::State_NotInitialized;
|
||||
|
||||
/* Destroy objects. */
|
||||
util::DestroyAt(event->waitable_object_list_storage);
|
||||
util::DestroyAt(event->multi_wait_object_list_storage);
|
||||
util::DestroyAt(event->cv_signaled);
|
||||
util::DestroyAt(event->cs_event);
|
||||
}
|
||||
@@ -89,7 +89,7 @@ namespace ams::os {
|
||||
}
|
||||
|
||||
/* Wake up whatever manager, if any. */
|
||||
GetReference(event->waitable_object_list_storage).SignalAllThreads();
|
||||
GetReference(event->multi_wait_object_list_storage).SignalAllThreads();
|
||||
}
|
||||
|
||||
void WaitEvent(EventType *event) {
|
||||
@@ -160,12 +160,12 @@ namespace ams::os {
|
||||
event->signaled = false;
|
||||
}
|
||||
|
||||
void InitializeWaitableHolder(WaitableHolderType *waitable_holder, EventType *event) {
|
||||
void InitializeMultiWaitHolder(MultiWaitHolderType *multi_wait_holder, EventType *event) {
|
||||
AMS_ASSERT(event->state == EventType::State_Initialized);
|
||||
|
||||
util::ConstructAt(GetReference(waitable_holder->impl_storage).holder_of_event_storage, event);
|
||||
util::ConstructAt(GetReference(multi_wait_holder->impl_storage).holder_of_event_storage, event);
|
||||
|
||||
waitable_holder->user_data = 0;
|
||||
multi_wait_holder->user_data = 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user