Changeset ceec23

Timestamp:

02/03/12 15:50:04 (3 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

868c8b322c052181e36262773192fb03fa02fdea

Parents:

938187b2a652cc6691f5a3b2ec9d0d73fd4e6748

git-author:

Micke Prag <micke.prag@telldus.se>2012-02-03 15:50:04+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-02-03 15:50:04+01:00

Message:

Add function Thread::startAndLock()

Location:

telldus-core/common

Files:

• Thread.cpp (modified) (5 diffs)
• Thread.h (modified) (2 diffs)

telldus-core/common/Thread.cpp

@@ -15 +15 @@
 #include <windows.h>
 #endif
+#include "EventHandler.h"
 
 using namespace TelldusCore;
@@ -21 +22 @@
 public:
         bool running;
+        EventRef threadStarted;
+        Mutex *mutex;
 #ifdef _WINDOWS
         HANDLE thread;
@@ -32 +35 @@
         d = new ThreadPrivate;
         d->thread = 0;
+        d->mutex = 0;
 }
 
@@ -45 +49 @@
         pthread_create(&d->thread, NULL, &Thread::exec, this );
 #endif
+}
+
+void Thread::startAndLock(Mutex *lock) {
+        EventHandler handler;
+        d->threadStarted = handler.addEvent();
+        d->mutex = lock;
+        this->start();
+        handler.waitForAny();
+        d->threadStarted.reset();
 }
 
@@ -65 +78 @@
         Thread *t = reinterpret_cast<Thread *>(ptr);
         if (t) {
+                if (t->d->threadStarted) {
+                        t->d->mutex->lock();
+                        t->d->threadStarted->signal();
+                }
                 t->run();
+                if (t->d->mutex) {
+                        t->d->mutex->unlock();
+                }
                 t->d->running = false;
         }

telldus-core/common/Thread.h

@@ -14 +14 @@
 
 #include <string>
+#include "Mutex.h"
 
 namespace TelldusCore {
@@ -22 +23 @@
                         virtual ~Thread();
                         void start();
+                        void startAndLock(Mutex *);
                         bool wait();