git.stg.codes
/
stg.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removed unused functions.
[stg.git]
/
projects
/
stargazer
/
stg_timer.cpp
diff --git
a/projects/stargazer/stg_timer.cpp
b/projects/stargazer/stg_timer.cpp
index 79844ba3213fca734ce2771b5f1a96f6e9a83a53..d39c61db0a15a9d45be125b54bc22e36086f1425 100644
(file)
--- a/
projects/stargazer/stg_timer.cpp
+++ b/
projects/stargazer/stg_timer.cpp
@@
-1,15
+1,21
@@
-#include <unistd.h>
-#include <pthread.h>
+#include "stg_timer.h"
+
+#include "stg/common.h"
+#include <ctime>
#include <cstring>
#include <cstring>
+#include <csignal>
-#include "common.h"
+#include <pthread.h>
+
+void * StgTimer(void *);
static int nonstop;
static pthread_t thrStgTimer;
static bool isTimerRunning = false;
volatile time_t stgTime;
static int nonstop;
static pthread_t thrStgTimer;
static bool isTimerRunning = false;
volatile time_t stgTime;
+#ifdef STG_TIMER_DEBUG
const int TIME_SPEED = 1;
/*
1 - 1x speed
const int TIME_SPEED = 1;
/*
1 - 1x speed
@@
-24,6
+30,7
@@
const int START_TIME = 0;
1 - start before new day (3 min before) 29.11.2005 23:57:00
2 - start before new month (3 min before) 30.11.2005 23:57:00
*/
1 - start before new day (3 min before) 29.11.2005 23:57:00
2 - start before new month (3 min before) 30.11.2005 23:57:00
*/
+#endif
//-----------------------------------------------------------------------------
void * StgTimer(void *)
//-----------------------------------------------------------------------------
void * StgTimer(void *)
@@
-33,7
+40,7
@@
struct tm lt;
memset(<, 0, sizeof(lt));
lt.tm_year = 2007 - 1900; // 2005
memset(<, 0, sizeof(lt));
lt.tm_year = 2007 - 1900; // 2005
-lt.tm_mon = 1
0
- 1; // Nov
+lt.tm_mon = 1
1
- 1; // Nov
lt.tm_hour = 23; // 23 h
lt.tm_min = 57; // 50 min
lt.tm_sec = 0; // 00 sec
lt.tm_hour = 23; // 23 h
lt.tm_min = 57; // 50 min
lt.tm_sec = 0; // 00 sec
@@
-54,18
+61,26
@@
switch (START_TIME)
stgTime = mktime(<);
break;
}
stgTime = mktime(<);
break;
}
+#else
+stgTime = time(NULL);
#endif
#endif
+sigset_t signalSet;
+sigfillset(&signalSet);
+pthread_sigmask(SIG_BLOCK, &signalSet, NULL);
+
nonstop = 1;
isTimerRunning = true;
while (nonstop)
{
#ifdef STG_TIMER_DEBUG
nonstop = 1;
isTimerRunning = true;
while (nonstop)
{
#ifdef STG_TIMER_DEBUG
- usleep(1000000 / TIME_SPEED);
+ struct timespec ts = {0, 1000000000 / TIME_SPEED};
+ nanosleep(&ts, NULL);
stgTime++;
#else
stgTime++;
#else
+ struct timespec ts = {0, 500000000};
+ nanosleep(&ts, NULL);
stgTime = time(NULL);
stgTime = time(NULL);
- usleep(500000);
#endif
}
isTimerRunning = false;
#endif
}
isTimerRunning = false;
@@
-79,7
+94,7
@@
static int a = 0;
isTimerRunning = false;
if (a == 0)
isTimerRunning = false;
if (a == 0)
- if (pthread_create(&thrStgTimer, NULL, StgTimer, NULL))
+ if (pthread_create(&thrStgTimer, NULL,
&
StgTimer, NULL))
{
isTimerRunning = false;
return -1;
{
isTimerRunning = false;
return -1;
@@
-104,9
+119,11
@@
return isTimerRunning;
int stgUsleep(unsigned long t)
{
#ifdef STG_TIMER_DEBUG
int stgUsleep(unsigned long t)
{
#ifdef STG_TIMER_DEBUG
-return usleep(t / TIME_SPEED);
+struct timespec ts = {static_cast<time_t>((t / TIME_SPEED) / 1000000), static_cast<long>(((t / TIME_SPEED) % 1000000) * 1000)};
+return nanosleep(&ts, NULL);
#else
#else
-return usleep(t);
+struct timespec ts = {static_cast<time_t>(t / 1000000), static_cast<long>((t % 1000000) * 1000)};
+return nanosleep(&ts, NULL);
#endif
}
//-----------------------------------------------------------------------------
#endif
}
//-----------------------------------------------------------------------------
@@
-116,5
+133,3
@@
void WaitTimer()
stgUsleep(200000);
}
//-----------------------------------------------------------------------------
stgUsleep(200000);
}
//-----------------------------------------------------------------------------
-
-