ksys/Utils: Add Event

CMakeLists.txt

@@ -72,6 +72,8 @@ add_executable(uking
 
   src/KingSystem/Terrain/teraSystem.h
 
+  src/KingSystem/Utils/Thread/Event.cpp
+  src/KingSystem/Utils/Thread/Event.h
   src/KingSystem/Utils/Byaml.cpp
   src/KingSystem/Utils/Byaml.h
   src/KingSystem/Utils/ByamlLocal.cpp

data/uking_functions.csv

@@ -86756,18 +86756,18 @@
 0x00000071010c09e4,sub_71010C09E4,8,
 0x00000071010c09ec,sub_71010C09EC,204,
 0x00000071010c0ab8,sub_71010C0AB8,92,
-0x00000071010c0b14,Event::ctorEvent,32,
-0x00000071010c0b34,Event::ctorDisposer,32,
-0x00000071010c0b54,Event::ctorEvent2,36,
-0x00000071010c0b78,Event::ctorDisposerLightEvent,40,
-0x00000071010c0ba0,Event::ctorDisposerLightEvent2,40,
-0x00000071010c0bc8,Event::dtor,20,
-0x00000071010c0bdc,Event::dtorDelete,52,
-0x00000071010c0c10,Event::initialize,16,
-0x00000071010c0c20,Event::wait,28,
-0x00000071010c0c3c,Event::waitTimed,32,
-0x00000071010c0c5c,Event::setSignal,52,
-0x00000071010c0c90,Event::resetSignal,64,
+0x00000071010c0b14,Event::ctorEvent,32,_ZN4ksys4util5EventC1Ev
+0x00000071010c0b34,Event::ctorDisposer,32,_ZN4ksys4util5EventC1EPN4sead4HeapE
+0x00000071010c0b54,Event::ctorEvent2,36,_ZN4ksys4util5EventC1Eb
+0x00000071010c0b78,Event::ctorDisposerLightEvent,40,_ZN4ksys4util5EventC1EPN4sead4HeapEb
+0x00000071010c0ba0,Event::ctorDisposerLightEvent2,40,_ZN4ksys4util5EventC1EPN4sead4HeapENS2_9IDisposer14HeapNullOptionEb
+0x00000071010c0bc8,Event::dtor,20,_ZN4ksys4util5EventD1Ev
+0x00000071010c0bdc,Event::dtorDelete,52,_ZN4ksys4util5EventD0Ev
+0x00000071010c0c10,Event::initialize,16,_ZN4ksys4util5Event10initializeEb
+0x00000071010c0c20,Event::wait,28,_ZN4ksys4util5Event4waitEv
+0x00000071010c0c3c,Event::waitTimed,32,_ZN4ksys4util5Event4waitEN4sead8TickSpanE
+0x00000071010c0c5c,Event::setSignal,52,_ZN4ksys4util5Event9setSignalEv
+0x00000071010c0c90,Event::resetSignal,64,_ZN4ksys4util5Event11resetSignalEv
 0x00000071010c0ce0,sub_71010C0CE0,32,
 0x00000071010c0d00,ThreadD0Base::ctor,96,
 0x00000071010c0d60,sub_71010C0D60,136,

src/KingSystem/Utils/Thread/Event.cpp

@@ -0,0 +1,50 @@
+#include "KingSystem/Utils/Thread/Event.h"
+
+namespace ksys::util {
+
+Event::Event() = default;
+
+Event::Event(sead::Heap* disposer_heap) : mEvent(disposer_heap) {}
+
+Event::Event(bool manual_reset) : mManualReset(manual_reset), mEvent(manual_reset) {}
+
+Event::Event(sead::Heap* disposer_heap, bool manual_reset)
+    : mManualReset(manual_reset), mEvent(disposer_heap, manual_reset) {}
+
+Event::Event(sead::Heap* disposer_heap, sead::IDisposer::HeapNullOption heap_null_option,
+             bool manual_reset)
+    : mManualReset(manual_reset), mEvent(disposer_heap, heap_null_option, manual_reset) {}
+
+Event::~Event() = default;
+
+void Event::initialize(bool manual_reset) {
+    mManualReset = manual_reset;
+    mEvent.initialize(manual_reset);
+}
+
+void Event::wait() {
+    if (!mSignalSet || !mManualReset)
+        mEvent.wait();
+}
+
+bool Event::wait(sead::TickSpan duration) {
+    return (mSignalSet && mManualReset) || mEvent.wait(duration);
+}
+
+void Event::setSignal() {
+    if (mSignalSet == 1 && mManualReset)
+        return;
+
+    mSignalSet.exchange(1);
+    mEvent.setSignal();
+}
+
+void Event::resetSignal() {
+    if (!mSignalSet && mManualReset)
+        return;
+
+    mEvent.resetSignal();
+    mSignalSet.exchange(0);
+}
+
+}  // namespace ksys::util

src/KingSystem/Utils/Thread/Event.h

@@ -0,0 +1,33 @@
+#pragma once
+
+#include <thread/seadEvent.h>
+#include "KingSystem/Utils/Types.h"
+#include <thread/seadAtomic.h>
+
+namespace ksys::util {
+
+class Event {
+public:
+    Event();
+    explicit Event(sead::Heap* disposer_heap);
+    explicit Event(bool manual_reset);
+    Event(sead::Heap* disposer_heap, bool manual_reset);
+    Event(sead::Heap* disposer_heap, sead::IDisposer::HeapNullOption heap_null_option,
+          bool manual_reset);
+    virtual ~Event();
+
+    void initialize(bool manual_reset);
+    void wait();
+    bool wait(sead::TickSpan duration);
+    void setSignal();
+    void resetSignal();
+
+private:
+    bool mManualReset = false;
+    sead::Atomic<u32> mSignalSet = 0;
+    sead::Event mEvent;
+};
+KSYS_CHECK_SIZE_NX150(sead::Event, 0x30);
+KSYS_CHECK_SIZE_NX150(Event, 0x40);
+
+}  // namespace ksys::util