m_initalized flag moved to core.sync.event.Event

This flag now is redundant for Windows platform

Author: denizzzka

druntime/src/core/sync/event.d

@@ -75,7 +75,8 @@ nothrow @nogc:
      */
     void initialize(bool manualReset, bool initialState)
     {
-        osEvent.create(manualReset, initialState);
+        osEvent = OsEvent(manualReset, initialState);
+        m_initalized = true;
     }
 
     // copying not allowed, can produce resource leaks
@@ -85,6 +86,7 @@ nothrow @nogc:
     ~this()
     {
         terminate();
+        m_initalized = false;
     }
 
     /**
@@ -104,13 +106,15 @@ nothrow @nogc:
     /// Set the event to "signaled", so that waiting clients are resumed
     void setIfInitialized()
     {
-        osEvent.setIfInitialized();
+        if(m_initalized)
+            osEvent.set();
     }
 
     /// Reset the event manually
     void reset()
     {
-        osEvent.reset();
+        if(m_initalized)
+            osEvent.reset();
     }
 
     /**
@@ -121,6 +125,9 @@ nothrow @nogc:
      */
     bool wait()
     {
+        if (!m_initalized)
+            return false;
+
         return osEvent.wait();
     }
 
@@ -135,12 +142,16 @@ nothrow @nogc:
      */
     bool wait(Duration tmout)
     {
+        if (!m_initalized)
+            return false;
+
         return osEvent.wait(tmout);
     }
 
 private:
     mixin("import " ~ osEventImport ~ ";");
     OsEvent osEvent;
+    bool m_initalized;
 }
 
 // Test single-thread (non-shared) use.

druntime/src/rt/sys/posix/osevent.d

@@ -11,10 +11,8 @@ import core.internal.abort : abort;
 
 struct OsEvent
 {
-    void create(bool manualReset, bool initialState) nothrow @trusted @nogc
+    this(bool manualReset, bool initialState) nothrow @trusted @nogc
     {
-        if (m_initalized)
-            return;
         pthread_mutex_init(cast(pthread_mutex_t*) &m_mutex, null) == 0 ||
             abort("Error: pthread_mutex_init failed.");
         static if ( is( typeof( pthread_condattr_setclock ) ) )
@@ -37,40 +35,29 @@ struct OsEvent
 
         m_state = initialState;
         m_manualReset = manualReset;
-        m_initalized = true;
     }
 
-    void destroy() nothrow @trusted @nogc
+    ~this() nothrow @trusted @nogc
     {
-        if (m_initalized)
-        {
-            pthread_mutex_destroy(&m_mutex) == 0 ||
-                abort("Error: pthread_mutex_destroy failed.");
-            pthread_cond_destroy(&m_cond) == 0 ||
-                abort("Error: pthread_cond_destroy failed.");
-            m_initalized = false;
-        }
+        pthread_mutex_destroy(&m_mutex) == 0 ||
+            abort("Error: pthread_mutex_destroy failed.");
+        pthread_cond_destroy(&m_cond) == 0 ||
+            abort("Error: pthread_cond_destroy failed.");
     }
 
-    void setIfInitialized() nothrow @trusted @nogc
+    void set() nothrow @trusted @nogc
     {
-        if (m_initalized)
-        {
-            pthread_mutex_lock(&m_mutex);
-            m_state = true;
-            pthread_cond_broadcast(&m_cond);
-            pthread_mutex_unlock(&m_mutex);
-        }
+        pthread_mutex_lock(&m_mutex);
+        m_state = true;
+        pthread_cond_broadcast(&m_cond);
+        pthread_mutex_unlock(&m_mutex);
     }
 
     void reset() nothrow @trusted @nogc
     {
-        if (m_initalized)
-        {
-            pthread_mutex_lock(&m_mutex);
-            m_state = false;
-            pthread_mutex_unlock(&m_mutex);
-        }
+        pthread_mutex_lock(&m_mutex);
+        m_state = false;
+        pthread_mutex_unlock(&m_mutex);
     }
 
     bool wait() nothrow @trusted @nogc
@@ -80,9 +67,6 @@ struct OsEvent
 
     bool wait(Duration tmout) nothrow @trusted @nogc
     {
-        if (!m_initalized)
-            return false;
-
         pthread_mutex_lock(&m_mutex);
 
         int result = 0;
@@ -114,7 +98,6 @@ private:
 
     pthread_mutex_t m_mutex;
     pthread_cond_t m_cond;
-    bool m_initalized;
     bool m_state;
     bool m_manualReset;
 }

druntime/src/rt/sys/windows/osevent.d

@@ -12,43 +12,34 @@ import core.internal.abort : abort;
 
 struct OsEvent
 {
-    void create(bool manualReset, bool initialState) nothrow @trusted @nogc
+    this(bool manualReset, bool initialState) nothrow @trusted @nogc
     {
-        if (m_event)
-            return;
         m_event = CreateEvent(null, manualReset, initialState, null);
         m_event || abort("Error: CreateEvent failed.");
     }
 
-    void destroy() nothrow @trusted @nogc
+    ~this() nothrow @trusted @nogc
     {
-        if (m_event)
-            CloseHandle(m_event);
-        m_event = null;
+        CloseHandle(m_event);
     }
 
-    void setIfInitialized() nothrow @trusted @nogc
+    void set() nothrow @trusted @nogc
     {
-        if (m_event)
-            SetEvent(m_event);
+        SetEvent(m_event);
     }
 
     void reset() nothrow @trusted @nogc
     {
-        if (m_event)
-            ResetEvent(m_event);
+        ResetEvent(m_event);
     }
 
     bool wait() nothrow @trusted @nogc
     {
-        return m_event && WaitForSingleObject(m_event, INFINITE) == WAIT_OBJECT_0;
+        return WaitForSingleObject(m_event, INFINITE) == WAIT_OBJECT_0;
     }
 
     bool wait(Duration tmout) nothrow @trusted @nogc
     {
-        if (!m_event)
-            return false;
-
         auto maxWaitMillis = dur!("msecs")(uint.max - 1);
 
         while (tmout > maxWaitMillis)