Changeset 33856 for lang/objective-cplusplus/i3/trunk/src/mil/include

Timestamp:

06/09/09 11:16:27 (4 years ago)

Author:

saturday06

Message:

jioafdjasd

Location:

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

Files:

• Module.h (modified) (2 diffs)
• Thread.h (modified) (4 diffs)
• gui-cocoa/GuiModule.h (modified) (2 diffs)
• gui-windows/GuiModule.h (modified) (1 diff)
• os-unix/Thread.h (modified) (4 diffs)
• os-windows/Thread.h (modified) (1 diff)

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

@@ -109 +109 @@
             return;
         }
-        void* mem = NULL;
-        pool::MemoryList* m = NULL;
-        boost::tie(mem, m) = target.tls.consumer.work(&event);
+
+        pool::MemoryList* m = target.tls.consumer.pop(event.owner_id);
         if (!m) {
-            return;
-        }
+            target.tls.consumer.store(&event);
+            return;
+        }
+        
         pool::ReturnMemoryEvent<pool::Blocks<Event<Data> >::value> e;
         e.memory = m;
@@ -121 +122 @@
             return;
         }
-        (reinterpret_cast<Sender*>(t))->post(e, target, mem, event.owner_id);
+        (reinterpret_cast<Sender*>(t))->post(e, target, (void*)&event, event.owner_id);
     }
 public:

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

@@ -180 +180 @@
     }
 
+    MemoryList* pop(int owner_id) {
+        if (sizes[owner_id] > 20) {
+            return NULL;
+        }
+        MemoryList* result = heads[owner_id];
+        heads[owner_id] = 0;
+        sizes[owner_id] = 0;
+        return result;
+    }
+
+    template <class T>
+    void store(T* mem) {
+        int owner_id = mem->owner_id;
+        MemoryList* l = (MemoryList*)mem;
+        int blocks = ((sizeof(T) - 1) / BLOCK_SIZE) + 1;
+        l->blocks = blocks;
+
+        if (blocks > MALLOC_BLOCKS_THESHOLD) {
+            free(mem);
+            return;
+        }
+
+        l->next = heads[owner_id];
+        heads[owner_id] = l;
+        sizes[owner_id]++;
+    }
+
+/*    
     template <class T>
     boost::tuple<void*, MemoryList*> work(T* mem) {
+        using namespace boost;
         int owner_id = mem->owner_id;
 
@@ -188 +217 @@
             heads[owner_id] = 0;
             sizes[owner_id] = 0;
-            return boost::tuple<void*, MemoryList*>((void*)mem, result);
+            return tuple<void*, MemoryList*>((void*)mem, result);
         }
 
@@ -196 +225 @@
         if (blocks > MALLOC_BLOCKS_THESHOLD) {
             free(mem);
-            return boost::tuple<void*, MemoryList*>(NULL, NULL);
+            return tuple<void*, MemoryList*>(NULL, NULL);
         }
 
@@ -202 +231 @@
         heads[owner_id] = l;
         sizes[owner_id]++;
-        return boost::tuple<void*, MemoryList*>(NULL, NULL);
-    }
+        return tuple<void*, MemoryList*>(NULL, NULL);
+    }
+};
+*/
 };
 }

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

@@ -110 +110 @@
             return;
         }
-        void* mem = NULL;
-        pool::MemoryList* m = NULL;
-        boost::tie(mem, m) = target.tls.consumer.work(&event);
+
+        pool::MemoryList* m = target.tls.consumer.pop(event.owner_id);
         if (!m) {
+            target.tls.consumer.store(&event);
             return;
         }
+        
         pool::ReturnMemoryEvent<pool::Blocks<Event<Data> >::value> e;
         e.memory = m;
@@ -122 +123 @@
             return;
         }
-        (reinterpret_cast<Sender*>(t))->post(e, target, mem, event.owner_id);
+        (reinterpret_cast<Sender*>(t))->post(e, target, (void*)&event, event.owner_id);
     }
 public:

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

@@ -119 +119 @@
         }
 
-        void* mem = NULL;
-        pool::MemoryList* m = NULL;
-        boost::tie(mem, m) = target.tls.consumer.work(&event);
+
+
+        pool::MemoryList* m = target.tls.consumer.pop(event.owner_id);
         if (!m) {
-            return;
-        }
+            target.tls.consumer.store(&event);
+            return;
+        }
+        
         pool::ReturnMemoryEvent<pool::Blocks<Event<Data> >::value> e;
         e.memory = m;
-        void* t =  threads[event.owner_id].load();
+        void* t = threads[event.owner_id].load();
         if (!t) {
-            // error
-            return;
-        }
-        (reinterpret_cast<Sender*>(t))->post(e, target, mem, event.owner_id);
+            return;
+        }
+        (reinterpret_cast<Sender*>(t))->post(e, target, (void*)&event, event.owner_id);
     }
 

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

@@ -1 +1 @@
 #pragma once
+#include "../Atomic.h"
 #include "../Mil.h"
-#include "../Atomic.h"
 #include <pthread.h>
 #include <unistd.h>
@@ -46 +46 @@
 class Thread : public boost::noncopyable
 {
-    mil::atomic<bool> isExited;
+    atomic<bool> isExited;
     pthread_t t;
     pthread_attr_t a;
@@ -109 +109 @@
     void join()
     {
+        threads[thread_id].store(NULL);
         for (int retry = 50; !isExited.load(); retry--)
         {
@@ -118 +119 @@
         }
     }
+
     Thread() : isExited(true), thread_id(0)
     {

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

@@ -98 +98 @@
         }
 
+        threads[thread_id].store(NULL);
+
         for (int retry = 50; !InterlockedExchangePointer(&isExited, 0); retry--)
         {