Changeset 868c8b

Timestamp:

02/03/12 15:52:15 (3 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

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

Children:

12506815144a25f959a1c78776ad82fa8970b5a3

Parents:

ceec23dfed3ad0e67cef7e12bc29ef881880a79f

git-author:

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

git-committer:

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

Message:

The mutex must be locked and unlocked by the same thread. We easily get deadlocks in Windows otherwise

File:

• telldus-core/client/CallbackDispatcher.cpp (modified) (8 diffs)

telldus-core/client/CallbackDispatcher.cpp

@@ -16 +16 @@
 :Thread(), d(data), deviceId(id), method(m), strData(strD), doneRunning(false)
 {
-        d->mutex.lock();
-        this->start();
+        this->startAndLock(&d->mutex);
 }
 
@@ -33 +32 @@
 
         doneRunning = true;
-        d->mutex.unlock();
 }
 
@@ -40 +38 @@
 :Thread(), d(data), deviceId(id), changeEvent(event), changeType(type), doneRunning(false)
 {
-        d->mutex.lock();
-        this->start();
+        this->startAndLock(&d->mutex);
 }
 
@@ -55 +52 @@
         d->event(deviceId, changeEvent, changeType, d->id, d->context);
         doneRunning = true;
-        d->mutex.unlock();
 }
 
@@ -61 +57 @@
 :Thread(), d(data), controllerId(id), strData(strD), doneRunning(false)
 {
-        d->mutex.lock();
-        this->start();
+        this->startAndLock(&d->mutex);
 }
 
@@ -76 +71 @@
         d->event(strData.c_str(), controllerId, d->id, d->context);
         doneRunning = true;
-        d->mutex.unlock();
 }
 
@@ -82 +76 @@
         :Thread(), d(data), protocol(p), model(m), sensorId(id), dataType(type), value(v), timestamp(t), doneRunning(false)
 {
-        d->mutex.lock();
-        this->start();
+        this->startAndLock(&d->mutex);
 }
 
@@ -97 +90 @@
         d->event(protocol.c_str(), model.c_str(), sensorId, dataType, value.c_str(), timestamp, d->id, d->context);
         doneRunning = true;
-        d->mutex.unlock();
 }