Fixed admin provoledges reseting after password change. Fixes #28.

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

diff --git a/projects/stargazer/stg_timer.cpp b/projects/stargazer/stg_timer.cpp
index dd0a04e1a9d249ceae200214b528d1b0a1f60e1f..235c669e0df09dcea32c31d94e9b5347932b88ff 100644 (file)
--- a/projects/stargazer/stg_timer.cpp
+++ b/projects/stargazer/stg_timer.cpp
@@ -2,8 +2,9 @@
 
 #include <ctime>
 #include <cstring>
 
 #include <ctime>
 #include <cstring>

+#include <csignal>

 
 

-#include "common.h"
+#include "stg/common.h"

 
 static int nonstop;
 static pthread_t thrStgTimer;
 
 static int nonstop;
 static pthread_t thrStgTimer;


@@ -54,8 +55,14 @@ switch (START_TIME)
         stgTime = mktime(&lt);
         break;
     }
         stgTime = mktime(&lt);
         break;
     }

+#else
+stgTime = time(NULL);

 #endif
 
 #endif
 

+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+

 nonstop = 1;
 isTimerRunning = true;
 while (nonstop)
 nonstop = 1;
 isTimerRunning = true;
 while (nonstop)


@@ -63,12 +70,10 @@ while (nonstop)
     #ifdef STG_TIMER_DEBUG
     struct timespec ts = {0, 1000000000 / TIME_SPEED};
     nanosleep(&ts, NULL);
     #ifdef STG_TIMER_DEBUG
     struct timespec ts = {0, 1000000000 / TIME_SPEED};
     nanosleep(&ts, NULL);

-    //usleep(1000000 / TIME_SPEED);

     stgTime++;
     #else
     struct timespec ts = {0, 500000000};
     nanosleep(&ts, NULL);
     stgTime++;
     #else
     struct timespec ts = {0, 500000000};
     nanosleep(&ts, NULL);

-    //usleep(500000);

     stgTime = time(NULL);
     #endif
     }
     stgTime = time(NULL);
     #endif
     }


@@ -110,11 +115,9 @@ int stgUsleep(unsigned long t)
 #ifdef STG_TIMER_DEBUG
 struct timespec ts = {(t / TIME_SPEED) / 1000000, ((t / TIME_SPEED) % 1000000) * 1000};
 return nanosleep(&ts, NULL);
 #ifdef STG_TIMER_DEBUG
 struct timespec ts = {(t / TIME_SPEED) / 1000000, ((t / TIME_SPEED) % 1000000) * 1000};
 return nanosleep(&ts, NULL);

-//return usleep(t / TIME_SPEED);

 #else
 struct timespec ts = {t / 1000000, (t % 1000000) * 1000};
 return nanosleep(&ts, NULL);
 #else
 struct timespec ts = {t / 1000000, (t % 1000000) * 1000};
 return nanosleep(&ts, NULL);

-//return usleep(t);

 #endif
 }
 //-----------------------------------------------------------------------------
 #endif
 }
 //-----------------------------------------------------------------------------