Changeset 37803 for lang/objective-cplusplus/i3

Timestamp:

06/05/10 13:59:51 (3 years ago)

Author:

saturday06

Message:

yattoumakuitta...

Location:

lang/objective-cplusplus/i3/trunk/src/mil/include/mil

Files:

• Module.h (modified) (2 diffs)
• Pool.h (modified) (1 diff)
• gui-windows/GuiModule.h (modified) (2 diffs)

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Module.h

@@ -145 +145 @@
     void destroy() {
         break_loop_request = true;
+        semaphore.p();
     }
 
@@ -151 +152 @@
         exitNotifier.tls.flush();
         ExitEvent e;
-        post(e, exitNotifier, event_memory);
+        post(e, exitNotifier, event_memory);        
     }
 

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/Pool.h

@@ -5 +5 @@
 
 #define MIL_DEBUG_PRODUCER   0
-#define MIL_MY_PRODUCER      0
-#define MIL_MALLOC_PRODUCER  1
+#define MIL_MY_PRODUCER      1
+#define MIL_MALLOC_PRODUCER  0
 #define MIL_TBB_PRODUCER     0
 

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

@@ -182 +182 @@
         break_loop_request = true;
         break_loop_request_shared.store(true);
+        semaphore.p();
 
         // DestroyWindow -> dtor
@@ -212 +213 @@
 
         for (;;) {
+            // dirty if-condition is for most expected branch !?
+
             DWORD wakeup = MsgWaitForMultipleObjects(1, &(semaphore.handle), false, INFINITE, QS_ALLINPUT);
             if (wakeup == WAIT_OBJECT_0) {
                 execute_front();
-                                //continue;
             }
 
             MSG msg;            
             while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) {
-                // dirty if-condition is for most expected branch
                 if (msg.message != WM_QUIT) {
                     TranslateMessage(&msg);
                     DispatchMessage(&msg);
-                    if (likely(!break_loop_request)) {
-                        continue;
-                    }
                 }
-                                return;
-            }
+            }
+
+            if (likely(!break_loop_request)) {
+                continue;
+            }
+
+            return;
         }
     }