X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/9a52cec24d0e1ba7dc4e040fa80eec7c058ac603..19684ed5aca4366468f3d9cac0848edd46a1d1cf:/projects/stargazer/stg_timer.cpp?ds=sidebyside diff --git a/projects/stargazer/stg_timer.cpp b/projects/stargazer/stg_timer.cpp index dd0a04e1..235c669e 100644 --- a/projects/stargazer/stg_timer.cpp +++ b/projects/stargazer/stg_timer.cpp @@ -2,8 +2,9 @@ #include #include +#include -#include "common.h" +#include "stg/common.h" static int nonstop; static pthread_t thrStgTimer; @@ -54,8 +55,14 @@ switch (START_TIME) stgTime = mktime(<); break; } +#else +stgTime = time(NULL); #endif +sigset_t signalSet; +sigfillset(&signalSet); +pthread_sigmask(SIG_BLOCK, &signalSet, NULL); + 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); - //usleep(1000000 / TIME_SPEED); stgTime++; #else struct timespec ts = {0, 500000000}; nanosleep(&ts, NULL); - //usleep(500000); 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); -//return usleep(t / TIME_SPEED); #else struct timespec ts = {t / 1000000, (t % 1000000) * 1000}; return nanosleep(&ts, NULL); -//return usleep(t); #endif } //-----------------------------------------------------------------------------