Changeset 34448

Timestamp:

07/16/09 22:32:46 (4 years ago)

Author:

saturday06

Message:

developm

Location:

lang/objective-cplusplus/i3/trunk

Files:

• am/mil_test.am (modified) (1 diff)
• src/mil/include/mil/Debug.h (modified) (1 diff)
• src/mil/include/mil/ModuleCommon.h (modified) (1 diff)
• src/mil/include/mil/Serial.h (modified) (3 diffs)
• src/mil/include/mil/Thread.h (modified) (2 diffs)
• src/mil/include/mil/gui-windows/WindowProcedureRedirector.h (modified) (8 diffs)
• src/mil/include/mil/os-unix/Debug.h (modified) (1 diff)
• src/mil/include/mil/os-unix/Thread.h (modified) (1 diff)
• src/mil/include/mil/os-windows/Debug.h (modified) (1 diff)
• src/mil/include/mil/os-windows/Thread.h (modified) (1 diff)
• src/mil/src/Test8.cpp (modified) (4 diffs)
• src/mil/src/Test9.cpp (modified) (4 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/Test1.cpp \
 src/mil/src/Test2.cpp \
 src/mil/src/Test3.cpp \

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

@@ -37 +37 @@
         if (will_abort) {
             abort();
+            throw std::runtime_error("halt");
         }
     }

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

@@ -216 +216 @@
     }
     void flush() {
-        for (int i = 0; i < _countof(data); i++) {
+        for (size_t i = 0; i < _countof(data); i++) {
 #ifdef MIL_GUI_WINDOWS
             data[i].hWndCache = NULL;

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

@@ -1 +1 @@
 #pragma once
 #include "Mil.h"
+#include "Mutex.h"
 
 /**
@@ -12 +13 @@
     };
 private:
-    Mutex& mutex;
+    Mutex mutex;
     int max;
     int serial;
@@ -41 +42 @@
     }
 
-    void release(int v) {
+    bool release(int v) {
         synchronized (mutex) {
             try {
                 list.push_back(v);
             } catch (std::exception&) {
+                return false;
             }
         }
+        return true;
     }
 };

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

@@ -203 +203 @@
     Thread() : thread_id(thread_id_serial.retain()), is_exited(true) {
         if (thread_id == Serial::INVALID_VALUE) {
-            throw runtime_error("Can't retain thread_id");
+            halt << "can't retain thread id";
         }
         threads[thread_id].store(reinterpret_cast<void*>(this));
@@ -211 +211 @@
         this->join();
         threads[thread_id].store(NULL);
-        try {
-            thread_id_serial.release(thread_id);
-        } catch (std::exception&) {
+        if (!thread_id_serial.release(thread_id)) {
             halt << "can't release thread id";
         }
     }
 };
-
-class SynchronizeHelper : public boost::noncopyable {
-    Mutex& mutex;
-    bool once;
-public:
-    bool evaluation() {
-        if (once) {
-            return false;
-        }
-        once = true;
-        return true;
-    }
-
-    SynchronizeHelper(Mutex& mutex) : mutex(mutex), once(false) {
-        mutex.lock();
-    }
-
-    ~SynchronizeHelper() {
-        mutex.unlock();
-    }
-};
-
-#define synchronized(mutex) \
-    for(mil::SynchronizeHelper synchronize_helper_instance__##mutex (mutex); (synchronize_helper_instance__##mutex ).evaluation();)
 }
 

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

@@ -114 +114 @@
 #endif
 
-#define MIL_STATIC_WINDOWPROCEDURE_MAX 5
+#define MIL_STATIC_WINDOWPROCEDURE_MAX 10
 namespace mil {
 template <typename T, LRESULT (T::* WindowProcedure)(HWND, UINT, WPARAM, LPARAM)>
@@ -120 +120 @@
 public:
     static Serial serial;
-    WindowProcedureRedirector(T& receiver) : error(false), index(0), hWnd(NULL) { //, dynamic(false), dynamic_redirector(NULL)
-        try {
-            index = serial.get();
-        } catch (std::exception&) {
+    WindowProcedureRedirector(T& receiver) : error(false), index(serial.retain()), hWnd(NULL) { //, dynamic(false), dynamic_redirector(NULL)
+        if (index == Serial::INVALID_VALUE) {
             DebugBreak();
             error = true;
@@ -129 +127 @@
         }
         targets[index] = &receiver;
-    }
-
-    WNDPROC get() {
+        BOOST_STATIC_ASSERT(_countof(dispatchTable) == MIL_STATIC_WINDOWPROCEDURE_MAX);
+    }
+
+    WNDPROC get() const {
         if (error) {
             DebugBreak();
@@ -139 +138 @@
     }
 
-    bool set(HWND hWnd_) {
+    bool set(const HWND hWnd_) {
         if (error) {
             DebugBreak();
@@ -170 +169 @@
         BOOST_STATIC_ASSERT(sizeof(LONG_PTR) == sizeof(targets[index]));
 
-        try {
-            serial.release(index);
-        } catch (std::exception&) {
+        if (!serial.release(index)) {
             return;
         }
@@ -178 +175 @@
 private:
     bool error;
-    unsigned int index;
+    const int index;
     HWND hWnd;
-
-    static unsigned int index_seq;
-    static LONG_PTR index_stack_mutex;
-    static std::stack<unsigned int> index_stack;
     static T* targets[MIL_STATIC_WINDOWPROCEDURE_MAX];
     const static WNDPROC dispatchTable[MIL_STATIC_WINDOWPROCEDURE_MAX];
-
-    struct Guard {
-        LONG_PTR* mutex;
-        Guard(LONG_PTR* mutex) : mutex(mutex) {
-            while (InterlockedExchangePointer(mutex, 0)) {
-                Sleep(10);
-            }
-        }
-        ~Guard() {
-            InterlockedExchangePointer(mutex, 1);
-        }
-    };
 
     template <int Index>
@@ -214 +195 @@
 // dispatchTable
 template <typename T, LRESULT (T::* WindowProcedure)(HWND, UINT, WPARAM, LPARAM)>
-const WNDPROC WindowProcedureRedirector<T, WindowProcedure>::dispatchTable[MIL_STATIC_WINDOWPROCEDURE_MAX] = {
+const WNDPROC WindowProcedureRedirector<T, WindowProcedure>::dispatchTable[] = {
     WindowProcedureRedirector<T, WindowProcedure>::template dispatch<0>,
     WindowProcedureRedirector<T, WindowProcedure>::template dispatch<1>,
@@ -220 +201 @@
     WindowProcedureRedirector<T, WindowProcedure>::template dispatch<3>,
     WindowProcedureRedirector<T, WindowProcedure>::template dispatch<4>,
+    WindowProcedureRedirector<T, WindowProcedure>::template dispatch<5>,
+    WindowProcedureRedirector<T, WindowProcedure>::template dispatch<6>,
+    WindowProcedureRedirector<T, WindowProcedure>::template dispatch<7>,
+    WindowProcedureRedirector<T, WindowProcedure>::template dispatch<8>,
+    WindowProcedureRedirector<T, WindowProcedure>::template dispatch<9>,
 //#define WPR_TARGET_CLASS_ WindowProcedureRedirector<T, WindowProcedure>::template dispatch
 //#define WPR_MAKE_TEMPLATE_(MAX,INDEX,TEMPLATE) TEMPLATE<INDEX>,

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

@@ -31 +31 @@
             *((volatile int*)0) = -1;
             cerr << "SEGV suppressed !" << endl;
-            //abort();
+            abort();
+            throw std::runtime_error("halt");
         }
     }

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

@@ -1 @@
-#pragma once
-#include "../Atomic.h"
-#include "../Mil.h"
-#include <pthread.h>
-#include <unistd.h>
-#include <sched.h>
-
-/**
- * POSIX
- */
-
-namespace mil {
-
-class Mutex : public boost::noncopyable {
-    pthread_mutex_t mutex;
-public:
-    Mutex() {
-        pthread_mutex_init(&mutex, NULL);
-    }
-
-    void lock() {
-        pthread_mutex_lock(&mutex);
-    }
-
-    void unlock() {
-        pthread_mutex_unlock(&mutex);
-    }
-
-    ~Mutex() {
-        pthread_mutex_destroy(&mutex);
-    }
-};
-
-class Conditional {
-    pthread_cond_t cond;
-    pthread_mutex_t mutex;
-public:
-    Conditional() {
-        pthread_mutex_init(&mutex, NULL);
-        pthread_mutex_lock(&mutex);
-        pthread_cond_init(&cond, NULL);
-    }
-
-    ~Conditional() {
-        signal();
-        pthread_cond_destroy(&cond);
-        pthread_mutex_destroy(&mutex);
-    }
-
-    void wait() {
-        pthread_cond_wait(&cond, &mutex);
-    }
-
-    void signal() {
-        pthread_cond_signal(&cond);
-    }
-};
-}
-
-
-
-
-
-

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

@@ -185 +185 @@
             abort();
 #endif
+            throw std::runtime_error("halt");
         }
     }

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

@@ -1 @@
-#pragma once
-
-#include "../Mil.h"
-
-namespace mil {
-class Mutex {
-    CRITICAL_SECTION cs;
-public:
-    Mutex() {
-        InitializeCriticalSection(&cs);
-    }
-
-    void lock() {
-        EnterCriticalSection(&cs);
-    }
-
-    void unlock() {
-        LeaveCriticalSection(&cs);
-    }
-
-    ~Mutex() {
-        DeleteCriticalSection(&cs);
-    }
-};
-class Conditional {
-    HANDLE event;
-public:
-    Conditional() {
-        event = CreateEvent(NULL, TRUE, FALSE, NULL);
-    }
-
-    ~Conditional() {
-        signal();
-        CloseHandle(event);
-    }
-
-    void wait() {
-        WaitForSingleObject(event, INFINITE);
-    }
-
-    void signal() {
-        SetEvent(event);
-    }
-};
-}

lang/objective-cplusplus/i3/trunk/src/mil/src/Test8.cpp

@@ -24 +24 @@
 struct FooThread : Thread<FooThread, DefaultThread> {
     void run() {
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 30000; i++) {
@@ -36 +37 @@
 struct BarThread : Thread<BarThread, DefaultThread> {
     void run() {
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 50000; i++) {
@@ -48 +50 @@
 struct FooThread2 : Thread<FooThread2, DefaultThread> {
     void run() {
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 23456; i++) {
-            while (!spin2.exchange(false));
+            while (!spin2.exchange(false)) {
+            }
             global++;
             spin2.store(true);
@@ -60 +64 @@
 struct BarThread2 : Thread<BarThread2, DefaultThread> {
     void run() {
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 100000; i++) {
-            while (!spin2.exchange(false));
+            while (!spin2.exchange(false)) {
+            }
             global++;
             spin2.store(true);

lang/objective-cplusplus/i3/trunk/src/mil/src/Test9.cpp

@@ -27 +27 @@
     void createUI() {
         setWindow(create_window());
-        while (spin.load());
+        while (spin.load()) {
+        }
     }
 
@@ -45 +46 @@
     void run() {
         setWindow(create_window());
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 500; i++) {
@@ -62 +64 @@
     void run() {
         setWindow(create_window());
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 500; i++) {
@@ -78 +81 @@
     void run() {
         setWindow(create_window());
-        while (spin.load());
+        while (spin.load()) {
+        }
 
         for (int i = 0; i < 500; i++) {