Implement support for WEBIRC attributes.

[user/henk/code/inspircd.git] / include / threadengines / threadengine_win32.h

diff --git a/include/threadengines/threadengine_win32.h b/include/threadengines/threadengine_win32.h
index 1cebb50fe7c4d397b4dee842458542271930ba42..aac7b8b974ca3d49efcc20673db7266bc96c5372 100644 (file)
--- a/include/threadengines/threadengine_win32.h
+++ b/include/threadengines/threadengine_win32.h
@@ -38,6 +38,13 @@ class Thread;
 class CoreExport ThreadEngine
 {
  public:
+       /** Per-thread state, present in each Thread object, managed by the ThreadEngine
+        */
+       struct ThreadState
+       {
+               HANDLE handle;
+       };
+
        static DWORD WINAPI Entry(void* parameter);
 
        /** Create a new thread. This takes an already allocated
@@ -61,12 +68,6 @@ class CoreExport ThreadEngine
        void Stop(Thread* thread);
 };
 
-class CoreExport ThreadData
-{
- public:
-       HANDLE handle;
-};
-
 /** The Mutex class represents a mutex, which can be used to keep threads
  * properly synchronised. Use mutexes sparingly, as they are a good source
  * of thread deadlocks etc, and should be avoided except where absolutely
@@ -98,9 +99,8 @@ class CoreExport Mutex
        }
 };
 
-class ThreadQueueData
+class ThreadQueueData : public Mutex
 {
-       CRITICAL_SECTION mutex;
        HANDLE event;
  public:
        ThreadQueueData()
@@ -108,23 +108,11 @@ class ThreadQueueData
                event = CreateEvent(NULL, false, false, NULL);
                if (event == NULL)
                        throw CoreException("CreateEvent() failed in ThreadQueueData::ThreadQueueData()!");
-               InitializeCriticalSection(&mutex);
        }
 
        ~ThreadQueueData()
        {
                CloseHandle(event);
-               DeleteCriticalSection(&mutex);
-       }
-
-       void Lock()
-       {
-               EnterCriticalSection(&mutex);
-       }
-
-       void Unlock()
-       {
-               LeaveCriticalSection(&mutex);
        }
 
        void Wakeup()
@@ -134,9 +122,9 @@ class ThreadQueueData
 
        void Wait()
        {
-               LeaveCriticalSection(&mutex);
+               Unlock();
                WaitForSingleObject(event, INFINITE);
-               EnterCriticalSection(&mutex);
+               Lock();
        }
 };