chg_tariff -> change_tariff, change_tariff -> tariff_change

[stg.git] / projects / stargazer / stg_timer.cpp

diff --git a/projects/stargazer/stg_timer.cpp b/projects/stargazer/stg_timer.cpp
index 7903c38d70dfd825b30672ed4ce447c92d629a1a..6d2b4b0cdd245a28a33db648ba631befa64f123a 100644 (file)
--- a/projects/stargazer/stg_timer.cpp
+++ b/projects/stargazer/stg_timer.cpp
@@ -1,6 +1,6 @@
-#include <unistd.h>
 #include <pthread.h>
 
+#include <ctime>
 #include <cstring>
 
 #include "common.h"
@@ -54,6 +54,8 @@ switch (START_TIME)
         stgTime = mktime(&lt);
         break;
     }
+#else
+stgTime = time(NULL);
 #endif
 
 nonstop = 1;
@@ -61,11 +63,15 @@ isTimerRunning = true;
 while (nonstop)
     {
     #ifdef STG_TIMER_DEBUG
-    usleep(1000000 / TIME_SPEED);
+    struct timespec ts = {0, 1000000000 / TIME_SPEED};
+    nanosleep(&ts, NULL);
+    //usleep(1000000 / TIME_SPEED);
     stgTime++;
     #else
+    struct timespec ts = {0, 500000000};
+    nanosleep(&ts, NULL);
+    //usleep(500000);
     stgTime = time(NULL);
-    usleep(500000);
     #endif
     }
 isTimerRunning = false;
@@ -104,9 +110,13 @@ return isTimerRunning;
 int stgUsleep(unsigned long t)
 {
 #ifdef STG_TIMER_DEBUG
-return usleep(t / TIME_SPEED);
+struct timespec ts = {(t / TIME_SPEED) / 1000000, ((t / TIME_SPEED) % 1000000) * 1000};
+return nanosleep(&ts, NULL);
+//return usleep(t / TIME_SPEED);
 #else
-return usleep(t);
+struct timespec ts = {t / 1000000, (t % 1000000) * 1000};
+return nanosleep(&ts, NULL);
+//return usleep(t);
 #endif
 }
 //-----------------------------------------------------------------------------
@@ -116,5 +126,3 @@ void WaitTimer()
         stgUsleep(200000);
 }
 //-----------------------------------------------------------------------------
-
-