time: minor code cleanup

pull/4626/head
Victor Julien 6 years ago
parent 6176338d0b
commit 13b4ece11d

@ -69,7 +69,7 @@ static struct timeval current_time = { 0, 0 };
#endif #endif
//static SCMutex current_time_mutex = SCMUTEX_INITIALIZER; //static SCMutex current_time_mutex = SCMUTEX_INITIALIZER;
static SCSpinlock current_time_spinlock; static SCSpinlock current_time_spinlock;
static char live = TRUE; static bool live_time_tracking = true;
struct tm *SCLocalTime(time_t timep, struct tm *result); struct tm *SCLocalTime(time_t timep, struct tm *result);
struct tm *SCUtcTime(time_t timep, struct tm *result); struct tm *SCUtcTime(time_t timep, struct tm *result);
@ -89,24 +89,24 @@ void TimeDeinit(void)
void TimeModeSetLive(void) void TimeModeSetLive(void)
{ {
live = TRUE; live_time_tracking = true;
SCLogDebug("live time mode enabled"); SCLogDebug("live time mode enabled");
} }
void TimeModeSetOffline (void) void TimeModeSetOffline (void)
{ {
live = FALSE; live_time_tracking = false;
SCLogDebug("offline time mode enabled"); SCLogDebug("offline time mode enabled");
} }
int TimeModeIsLive(void) bool TimeModeIsLive(void)
{ {
return live; return live_time_tracking;
} }
void TimeSetByThread(const int thread_id, const struct timeval *tv) void TimeSetByThread(const int thread_id, const struct timeval *tv)
{ {
if (live == TRUE) if (live_time_tracking)
return; return;
TmThreadsSetThreadTimestamp(thread_id, tv); TmThreadsSetThreadTimestamp(thread_id, tv);
@ -115,7 +115,7 @@ void TimeSetByThread(const int thread_id, const struct timeval *tv)
#ifdef UNITTESTS #ifdef UNITTESTS
void TimeSet(struct timeval *tv) void TimeSet(struct timeval *tv)
{ {
if (live == TRUE) if (live_time_tracking)
return; return;
if (tv == NULL) if (tv == NULL)
@ -148,7 +148,7 @@ void TimeGet(struct timeval *tv)
if (tv == NULL) if (tv == NULL)
return; return;
if (live == TRUE) { if (live_time_tracking) {
gettimeofday(tv, NULL); gettimeofday(tv, NULL);
} else { } else {
#ifdef UNITTESTS #ifdef UNITTESTS

@ -51,7 +51,7 @@ void TimeSetIncrementTime(uint32_t);
void TimeModeSetLive(void); void TimeModeSetLive(void);
void TimeModeSetOffline (void); void TimeModeSetOffline (void);
int TimeModeIsLive(void); bool TimeModeIsLive(void);
struct tm *SCLocalTime(time_t timep, struct tm *result); struct tm *SCLocalTime(time_t timep, struct tm *result);
void CreateTimeString(const struct timeval *ts, char *str, size_t size); void CreateTimeString(const struct timeval *ts, char *str, size_t size);

Loading…
Cancel
Save