Changeset fb8e97

Timestamp:

01/09/12 17:40:44 (18 months ago)

Author:

Micke Prag <micke.prag@…>

Branches:

('master', '668dd99ac278cfd419d67879b141678facea630a')('windows_service_fixes', 'df6bd2788365991d36d5af2a75833b8de2a5860f')

Children:

df6bd2788365991d36d5af2a75833b8de2a5860f

Parents:

542d17a45de15d891024fbb5af13ececef77d3ec

git-author:

Micke Prag <micke.prag@telldus.se>2012-01-09 17:40:44+01:00

git-committer:

Micke Prag <micke.prag@telldus.se>2012-01-09 17:40:44+01:00

Message:

Implement class Timer in Windows

File:

• telldus-core/service/Timer.cpp (modified) (5 diffs)

telldus-core/service/Timer.cpp

@@ -1 +1 @@
 #include "Timer.h"
 #include "Mutex.h"
-#include "Log.h"
 #ifdef _WINDOWS
 #else
@@ -15 +14 @@
         bool running;
 #ifdef _WINDOWS
+        HANDLE cond;
+        TelldusCore::Mutex mutex;
 #else
         pthread_mutex_t waitMutex;
@@ -26 +27 @@
         d->event = event;
 #ifdef _WINDOWS
+        d->cond = CreateEventW(NULL, false, false, NULL);
 #else
         pthread_cond_init(&d->cond, NULL);
@@ -50 +52 @@
 void Timer::stop() {
 #ifdef _WINDOWS
+        TelldusCore::MutexLocker(&d->mutex);
+        d->running = false;
+        SetEvent(d->cond);
 #else
         //Signal event
@@ -63 +68 @@
 void Timer::run() {
 #ifdef _WINDOWS
-                sleep(2); //TODO: Implement me
+        int interval = 0;
+        {
+                TelldusCore::MutexLocker(&d->mutex);
+                d->running = true;
+                interval = d->interval*1000;
+        }
+        while(1) {
+                DWORD retval = WaitForSingleObject(d->cond, interval);
+                if (retval == WAIT_TIMEOUT) {
+                        d->event->signal();
+                }
+                TelldusCore::MutexLocker(&d->mutex);
+                if (!d->running) {
+                        break;
+                }
+        }
 #else
         struct timespec ts;