dev

1 files changed, 42 insertions, 39 deletions

diff --git a/lib/thread.h b/lib/thread.h
index 1598ff2..fcaaf4b 100644
--- a/lib/thread.h
+++ b/lib/thread.h
@@ -10,6 +10,41 @@
 
 #include "common.h"
 
+class cCondWait 
+{
+   public:
+
+      cCondWait();
+      ~cCondWait();
+
+      bool Wait(int TimeoutMs = 0);
+      void Signal();
+
+      static void SleepMs(int TimeoutMs);
+
+   private:
+
+      pthread_mutex_t mutex;
+      pthread_cond_t cond;
+      bool signaled;
+};
+
+class cCondVar 
+{
+   public:
+
+      cCondVar();
+      ~cCondVar();
+
+      void Wait(cMyMutex &Mutex);
+      bool TimedWait(cMyMutex &Mutex, int TimeoutMs);
+      void Broadcast();
+
+   private:
+
+      pthread_cond_t cond;
+};
+
 //***************************************************************************
 // Class cThread 
 //***************************************************************************
@@ -22,10 +57,11 @@ class cThread
       virtual ~cThread();
 
       void SetDescription(const char* Description, ...) __attribute__ ((format (printf, 2, 3)));
-      bool Start(int s = no);
+      bool Start(int s = no, int stackSize = na);
       bool Active();
       void SetPriority(int priority);
       void SetIOPriority(int priority);
+      void Cancel(int WaitSeconds = 0);
 
       static pid_t ThreadId();
 
@@ -33,14 +69,12 @@ class cThread
 
       static void* StartThread(cThread *Thread);
 
-      bool active;
-      bool running;
       pthread_t childTid;
       pid_t childThreadId;
-      cMyMutex mutex;
       char* description;
       bool lowPriority;
       int silent;
+      pthread_attr_t attr;
    
    protected:
 
@@ -49,42 +83,11 @@ class cThread
       void Lock()          { mutex.Lock(); }
       void Unlock()        { mutex.Unlock(); }
       bool Running()       { return running; }
-      void Cancel(int WaitSeconds = 0);
-};
-
-class cCondWait 
-{
-   public:
-
-      cCondWait();
-      ~cCondWait();
-
-      bool Wait(int TimeoutMs = 0);
-      void Signal();
-
-      static void SleepMs(int TimeoutMs);
-
-   private:
-
-      pthread_mutex_t mutex;
-      pthread_cond_t cond;
-      bool signaled;
-};
-
-class cCondVar 
-{
-   public:
 
-      cCondVar();
-      ~cCondVar();
-
-      void Wait(cMyMutex &Mutex);
-      bool TimedWait(cMyMutex &Mutex, int TimeoutMs);
-      void Broadcast();
-
-   private:
-
-      pthread_cond_t cond;
+      cCondVar waitCondition;
+      cMyMutex mutex;
+      bool active;
+      bool running;
 };
 
 //***************************************************************************