Changeset 32468 for lang/objective-cplusplus/i3/trunk/src/mil/include/mil/gui-windows/GuiModule.h

Timestamp:

04/16/09 03:41:58 (4 years ago)

Author:

saturday06

Message:

いたすと

Files:

• lang/objective-cplusplus/i3/trunk/src/mil/include/mil/gui-windows/GuiModule.h (modified) (10 diffs)

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/gui-windows/GuiModule.h

@@ -40 +40 @@
     PVOID breakLoopRequest;
     //DWORD_PTR destroyed;
-    PVOID destroyed;
+    atomic<PVOID> destroyed;
 
     bool repost;
@@ -50 +50 @@
 
 public:
-    pool::Producer producer;
-    pool::Consumer consumer;
+    Tls tls;
 
     GuiModule() : 
@@ -66 +65 @@
 
     ~GuiModule() {
-        if (!IsWindow(getWindow())) {
+        HWND w = getWindow();
+        if (!IsWindow(w))
+        {
             return;
         }
         wndproc.inactivate();
+        if (DestroyWindow(w) == 0)
+        {
+            // error
+            DebugBreak();
+        }
     }
 
@@ -105 +111 @@
             }
 
-            pool::MemoryList* m = target.consumer.work(&event);
+            pool::MemoryList* m = target.tls.consumer.work(&event);
             if (!m) {
                 return;
@@ -116 +122 @@
                 return;
             }
-            (reinterpret_cast<GuiModule<Child> * >(t))->post(e, target.producer);
+            (reinterpret_cast<GuiModule<Child> * >(t))->post(e, target.tls);
         }
     };
@@ -141 +147 @@
     {
         //PostQuitMessage(0);
-        InterlockedExchangePointer(&breakLoopRequest, (PVOID)1);
-        if (InterlockedExchangePointer(&destroyed, (PVOID)1) != 0)
-        {
-            return;
-        }
-        HWND w = getWindow();
-        if (!IsWindow(w))
-        {
-            return;
-        }
-        if (DestroyWindow(w) == 0)
-        {
-            // error
-            DebugBreak();
-        }
+        breakLoopRequest = (PVOID)1;
+        destroyed.store((PVOID)1);
     }
 
     void loop()
     {
-        if (InterlockedCompareExchangePointer((PVOID*)&breakLoopRequest, NULL, NULL))
-        {
-            //PostQuitMessage(0);
-            return;
-        }
-
-        if (!IsWindow(this->hLocalWnd)) {
+        if (breakLoopRequest || destroyed.load() || !IsWindow(this->hLocalWnd)) {
             return;
         }
 
         MSG msg = {};
-        for (;;)
+        while (__builtin_expect(!breakLoopRequest, true))
         {
             BOOL result = GetMessage(&msg, NULL, 0, 0);
@@ -190 +177 @@
 
     template <typename T>
-    void post(const T& event, mil::pool::Producer& sender_producer)
-    {
-        HWND hWnd = getWindow();
-        if (!hWnd)
-        {
-            // error
-            return;
-        }
+    void post(const T& event, mil::Tls& sender_tls)
+    {
+        HWND hWnd = sender_tls.thread[thread_id].hWnd;
+        if (__builtin_expect(!hWnd, false)) {
+            hWnd = getWindow();
+            if (!IsWindow(hWnd)) {
+                return;
+            }
+            sender_tls.thread[thread_id].hWnd = hWnd;
+        }
+
         if (sizeof(T) <= sizeof(LPARAM))
         {
@@ -207 +197 @@
             return;
         }
-        void* p = sender_producer.malloc<sizeof(Event<T>)>();
+
+        void* p = sender_tls.producer.malloc<sizeof(Event<T>)>();
         if (p == NULL)
         {
@@ -213 +204 @@
             return;
         }
+
         Event<T>* e = new(p) Event<T>;
         e->data = event;
@@ -248 +240 @@
             return 0;
         } else if (msg == WM_DESTROY || msg == WM_QUIT) {
-            InterlockedExchangePointer(&destroyed, (PVOID)1);
+            destroy();
         }