Changeset 36256

Timestamp:

12/24/09 12:39:00 (3 years ago)

Author:

saturday06

Message:

sdf

Location:

lang/objective-cplusplus/i3/trunk

Files:

• Makefile.am (modified) (1 diff)
• src/Tester.cpp (modified) (1 diff)
• src/gui-windows/InputWindowPlatform.h (modified) (4 diffs)
• src/mil/include/mil/StaticDataObjC.cpp (modified) (1 diff)
• src/mil/include/mil/Thread.h (modified) (7 diffs)
• src/mil/include/mil/gui-cocoa/CocoaThread.h (modified) (1 diff)
• tmp/main4.cpp (modified) (1 diff)
• tmp/nc.cpp (modified) (1 diff)

lang/objective-cplusplus/i3/trunk/Makefile.am

@@ -111 +111 @@
 endif
 
-
 if WITH_GUI_COCOA
 bin_PROGRAMS  += coco
-coco_SOURCES = tmp/main5.cpp
+coco_SOURCES = tmp/nc.cpp
 coco_CXXFLAGS = ${i3_CXXFLAGS}
 coco_LDFLAGS = ${i3_LDFLAGS}

lang/objective-cplusplus/i3/trunk/src/Tester.cpp

@@ -92 +92 @@
 }
 
-struct Focus {
+struct TestFocus {
 };
 
-#ifdef MIL_GUI_WINDOWS
 template <>
-void InputWindow::execute(Focus&) {
-        SetForegroundWindow(hLocalWnd);
-        SetFocus(hEdit);
+void InputWindow::execute(TestFocus&) {
+        focus();
 }
-#endif
 
 #ifdef MIL_OS_WINDOWS

lang/objective-cplusplus/i3/trunk/src/gui-windows/InputWindowPlatform.h

@@ -13 +13 @@
             public mil::GuiModule<InputWindowPlatform<Child> > {
 public:
+        friend class mil::GuiModule<InputWindowPlatform<Child> >;
     MIL_CRTP_CLASS_MEMBERS;
+
     InputWindowPlatform();
     ~InputWindowPlatform();
@@ -19 +21 @@
     void createUI();
     void run();
+    mil::atomic<HICON> hSharedIcon;
+
+protected:
+        void focus();
+    HWND hEdit;
+    HICON icon;
+    HMODULE riched20_dll;
+    size_t getEditVerticalMargin();
 
     void OnActivate(HWND hWnd, UINT state, HWND hWndActDeact, BOOL fMinimized);
@@ -35 +45 @@
     HBRUSH OnCtlColorEdit(HWND hWnd, HDC hdc, HWND hWndChild, int type);
 
-    //mil::atomic<HWND> hSharedEdit;
-    mil::atomic<HICON> hSharedIcon;
-
-protected:
-    HWND hEdit;
-    HMODULE riched20_dll;
-    size_t getEditVerticalMargin();
-private:
     bool is_dwm_extend_frame_into_client_area;
     struct {
@@ -64 +66 @@
 #endif
     } ce;
-    HICON icon;
+
 };
 

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/StaticDataObjC.cpp

@@ -2 +2 @@
 #import <Foundation/NSException.h>
 
-#include "gui-cocoa/CocoaThread.h"
+
+#include "Thread.h"
 #include "FilterException.h"
 

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

@@ -30 +30 @@
 
 #ifdef __OBJC__
-#include "gui-cocoa/CocoaThread.h"
+
+@interface WorkerThread : NSObject {
+@public
+    void* (*routine)(void*);
+    void* arg;
+}
+- (void)start;
+@end
+
 namespace mil {
 namespace thread {
@@ -55 +63 @@
         assert(thread == nil);
 
-        void* (*routine_)(void*) = foo::thread_routine;
-        void* arg_ = (void*)this;
-
         thread = [[WorkerThread alloc] init];
-        [thread setData:routine_ arg:arg_];
+                thread->routine = foo::thread_routine;
+                thread->arg = (void*)this;
         [NSThread detachNewThreadSelector:@selector(start) toTarget:thread withObject:nil];
         
@@ -166 +172 @@
 #endif
 
+
 namespace mil {
 template <class Child, template<class> class ThreadType = MIL_DEFAULT_THREAD>
 class Thread : public ThreadType<Thread<Child, ThreadType> > {
 public:
+        friend class ThreadType<Thread<Child, ThreadType> >;
     MIL_CRTP_CLASS_MEMBERS;
     const thread::id_t thread_id;
 
 private:
-    atomic<bool> thread_routine_running;
-
     enum THREAD_ROUTINE_STATUS {
         READY,
         RUNNING,
         STOPPING,
+                CLEANING,
     };
     atomic<THREAD_ROUTINE_STATUS> thread_routine_status;
-
-public:
-
     static int thread_routine_filtered(int, char** argv) {
         Thread<Child, ThreadType>* obj = (Thread<Child, ThreadType>*)argv;
@@ -192 +196 @@
             MIL_MODULE_GET_SUPER_CHILD(*obj);
 
+        if (o.thread_routine_status.load() != RUNNING) {
+                        debug << "double run?";
+                }
         o.run();
-        if (!o.thread_routine_running.exchange(false)) {
-            halt << "double stop";
-        }
-
+        if (o.thread_routine_status.load() != RUNNING) {
+                        debug << "double stop?";
+                }
+
+        o.thread_routine_status.store(STOPPING);
         return 0;
     }
@@ -205 +213 @@
     }
 
+public:
     void run() {
     }
 
     void start() {
-        if (thread_routine_running.exchange(true)) {
-            debug << "double start";
-            return;
-        }
         if (!thread_routine_status.bool_compare_and_swap(READY, RUNNING)) {
             debug << "thread routine is not ready";
@@ -222 +227 @@
 
     void join() {
-        if (!thread_routine_status.bool_compare_and_swap(RUNNING, STOPPING)) {
-            //debug << "thread routine is not running";
-            return;
-        }
-
-        for (int retry = 50; this->thread_routine_running.load(); retry--) {
+        for (int retry = 50; thread_routine_status.load() == RUNNING; retry--) {
+
             if (retry == 0) {
-                halt << "thread don't exit";
+                halt << "thread doesn't exit";
                 break;
             }
+
             sleep(1);
         }
 
+                // only one thread can clean
+                if (!thread_routine_status.bool_compare_and_swap(STOPPING, CLEANING)) {
+                        return;
+                }
+
         ThreadType<Thread<Child, ThreadType> >::clean();
 
-        if (!thread_routine_status.bool_compare_and_swap(STOPPING, READY)) {
+        if (!thread_routine_status.bool_compare_and_swap(CLEANING, READY)) {
             debug << "thread routine is stopping";
             return;
@@ -244 +251 @@
 
     Thread() : thread_id(thread::id_serial.retain()),
-               thread_routine_running(false),
                thread_routine_status(READY) {
         if (!thread::is_valid_id(thread_id)) {

lang/objective-cplusplus/i3/trunk/src/mil/include/mil/gui-cocoa/CocoaThread.h

@@ -1 @@
-#pragma once
 
-@interface WorkerThread :
-NSObject {
-    void* (*routine)(void*);
-    void* arg;
-}
-- (void)setData:
-(void* (*)(void*))routine_ arg:
-(void*)arg_;
-- (void)start;
-@end
-

lang/objective-cplusplus/i3/trunk/tmp/main4.cpp

@@ -66 +66 @@
     WorkerThread* thread = [[WorkerThread alloc] init];
     thread->thread_id = 1;
-    [NSThread detachNewThreadSelector:@selector(startThread) toTarget:thread withObject:nil];
+    [NSThread detachNewThreadSelector:@selector(startThread)
+              toTarget:thread withObject:nil];
 
     sleep(2);

lang/objective-cplusplus/i3/trunk/tmp/nc.cpp

@@ -141 +141 @@
     }
 
-    sleep(1);
+    sleep(2);
 
     NSNotificationCenter* center = [NSNotificationCenter defaultCenter];
     NSNotification* notification3 = [NSNotification notificationWithName:@"TestNotification3" object:nil];
     [center postNotification:notification3];
+    sleep(2);
+
     NSNotification* notification2 = [NSNotification notificationWithName:@"TestNotification2" object:nil];
     [center postNotification:notification2];
+    sleep(2);
+
     NSNotification* notification1 = [NSNotification notificationWithName:@"TestNotification1" object:nil];
     [center postNotification:notification1];
 
-    sleep(5);
+    [[NSRunLoop currentRunLoop] run];
 
     [pool release];