Changeset 34192 for lang/objective-cplusplus

Timestamp:

06/30/09 12:28:54 (4 years ago)

Author:

saturday06

Message:

iaiodjfd

Location:

lang/objective-cplusplus/i3/trunk

Files:

• am/mil_test.am (modified) (1 diff)
• src/mil/include/mil/ModuleCommon.h (modified) (1 diff)
• src/mil/include/mil/gui-cocoa/GuiModule.h (modified) (5 diffs)

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

@@ -7 +7 @@
 src/mil/src/TestMain.cpp \
 src/mil/src/StaticData.cpp \
-src/mil/src/Test7.cpp \
-src/mil/src/Test1.cpp \
-src/mil/src/Test2.cpp \
-src/mil/src/Test3.cpp \
-src/mil/src/Test4.cpp \
-src/mil/src/Test5.cpp \
-src/mil/src/Test6.cpp
+src/mil/src/Test8.cpp
+#src/mil/src/Test7.cpp \
+#src/mil/src/Test1.cpp \
+#src/mil/src/Test2.cpp \
+#src/mil/src/Test3.cpp \
+#src/mil/src/Test4.cpp \
+#src/mil/src/Test5.cpp \
+#src/mil/src/Test6.cpp
 #src/mil/src/BoostTestDummyLib.cpp
+
 
 

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

@@ -271 +271 @@
 #ifdef MIL_GUI_WINDOWS
         HWND hWnd;
+#elif MIL_GUI_COCOA
+        NSWindow* window;
 #endif
     } thread[MIL_MAX_THREADS];

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

@@ -15 +15 @@
     Tls tls;
 private:
-    class EventBase : public boost::noncopyable
-    {
-    public:
-        void (*execute)(void* event, void* target);
-        intptr_t owner_id;
-        EventBase* next;
-    };
-
-    class EventList : public boost::noncopyable
-    {
-        EventBase* head;
-        EventBase* tail;
-        boost::details::pool::default_mutex m;
-        typedef boost::details::pool::guard<boost::details::pool::default_mutex> guard;
-    public:
-        EventList()
-        {
-            head = NULL;
-            tail = NULL;
-        }
-
-        void push(EventBase& e)
-        {
-            guard g(m);
-            e.next = NULL;
-            if (head == NULL)   // tail == NULL
-            {
-                head = &e;
-                tail = &e;
-                return;
-            }
-            tail->next = &e;
-            tail = &e;
-        }
-
-        void pop()
-        {
-            guard g(m);
-            if (!head)
-            {
-                return;
-            }
-            head = head->next;
-        }
-
-        EventBase* top()
-        {
-            guard g(m);
-            return head;
-        }
-
-        void clear()
-        {
-            guard g(m);
-            head = NULL;
-            tail = NULL;
-        }
-    };
-
-
     template <typename T>
-    class Event : public EventBase
+    class Event : boost::noncopyable
     {
     public:
@@ -86 +26 @@
 
 private:
-    EventList list;
-    Conditional c;
     bool repost;
-    atomic<bool> isWaiting;
+
 protected:
     NSWindow *window;
 
 public:
-
+    NSWindow getWindow()
+    {
+        return window;
+    }
+    
     void requestExit(void* event_memory)
     {
-        list.clear();
         ExitEvent e;
-        post(e, exitNotifier, event_memory, exitNotifier.tls.thread_id);
+        post(e, *this);
     }
 
-    GuiModule() : tls(this->thread_id), repost(false), isWaiting(false), window(NULL)
+    GuiModule() : tls(this->thread_id), repost(false), window(NULL)
     {
         set_auto_join(this);
@@ -136 +77 @@
         if (target.repost)
         {
-            target.list.push(event);
+            target.post(event.data, target);
             return;
         }
-
-        freeEvent<Sender>(event, target);
     }
 public:
@@ -152 +91 @@
     void post(const T& event, Sender& sender, void* memory = NULL, intptr_t owner_id = 0)
     {
-        void* p = NULL;
-        if (memory)
-        {
-            p = memory;
-        }
-        else
-        {
-            pool::Producer& producer = sender.tls.producer;
-            p = producer.malloc<sizeof(Event<T>)>();
+        NSWindow* localWindow = sender.tls.thread[this->thread_id].window;
+        if (!localWindow) {
+            localWindow = getWindow();
+            sender.tls.thread[this->thread_id].window = localWindow;
         }
 
-        if (p == NULL)
-        {
-            // XXX
-            return;
-        }
-
-        Event<T>* e = new(p) Event<T>;
-        e->data = event;
-        e->execute = dispatcher<T, Sender>;
-        if (memory)
-        {
-            e->owner_id = owner_id;
-        }
-        else
-        {
-            e->owner_id = sender.tls.thread_id;
-        }
-
-        list.push(*e);
-        if (isWaiting.load())
-        {
-            c.signal();
-        }
+        Event<T> e;
+        e.data = event;
+        e.execute = dispatcher<T, Sender>;
     }
 public:
@@ -205 +119 @@
     void execute_front()
     {
-        EventBase* e = list.top();
-        if (!e)
-        {
-            return;
-        }
-        e->execute((void*)e, (void*)this);
     }