Fix the websocket origin config example.

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

diff --git a/include/threadengines/threadengine_pthread.h b/include/threadengines/threadengine_pthread.h
index 9304536f1215ff0b895c5a52630a7cb005ad7ac6..ca33542607839ea168c48cb750af928552cca35b 100644 (file)
--- a/include/threadengines/threadengine_pthread.h
+++ b/include/threadengines/threadengine_pthread.h
@@ -36,6 +36,13 @@
 class CoreExport ThreadEngine
 {
  public:
+       /** Per-thread state, present in each Thread object, managed by the ThreadEngine
+        */
+       struct ThreadState
+       {
+               pthread_t pthread_id;
+       };
+
        /** Create a new thread. This takes an already allocated
         * Thread* pointer and initializes it to use this threading
         * engine. On failure, this function may throw a CoreException.
@@ -57,12 +64,6 @@ class CoreExport ThreadEngine
        void Stop(Thread* thread);
 };
 
-class CoreExport ThreadData
-{
- public:
-       pthread_t pthread_id;
-};
-
 /** 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
@@ -73,7 +74,7 @@ class CoreExport ThreadData
  */
 class CoreExport Mutex
 {
- private:
+ protected:
        pthread_mutex_t putex;
  public:
        /** Constructor.
@@ -102,33 +103,20 @@ class CoreExport Mutex
        }
 };
 
-class ThreadQueueData
+class ThreadQueueData : public Mutex
 {
-       pthread_mutex_t mutex;
        pthread_cond_t cond;
  public:
        ThreadQueueData()
        {
-               pthread_mutex_init(&mutex, NULL);
                pthread_cond_init(&cond, NULL);
        }
 
        ~ThreadQueueData()
        {
-               pthread_mutex_destroy(&mutex);
                pthread_cond_destroy(&cond);
        }
 
-       void Lock()
-       {
-               pthread_mutex_lock(&mutex);
-       }
-
-       void Unlock()
-       {
-               pthread_mutex_unlock(&mutex);
-       }
-
        void Wakeup()
        {
                pthread_cond_signal(&cond);
@@ -136,7 +124,7 @@ class ThreadQueueData
 
        void Wait()
        {
-               pthread_cond_wait(&cond, &mutex);
+               pthread_cond_wait(&cond, &putex);
        }
 };