mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 15:32:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

CTimeThread: sectionsd.cpp: use thread save localtime_r

Browse Source
This commit is contained in:
Thilo Graf
2015-01-12 21:38:29 +01:00
parent 674f2f983a
commit 76ca33de9f
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/eitd/sectionsd.cpp
View File

@@ -37,7 +37,7 @@
#include <errno.h> #include <errno.h>
#include <signal.h> #include <signal.h>
#include <sys/time.h> #include <sys/time.h>
#include <time.h>
#include <connection/basicsocket.h> #include <connection/basicsocket.h>
#include <connection/basicserver.h> #include <connection/basicserver.h>
@@ -1370,12 +1370,12 @@ void CTimeThread::waitForTimeset(void)
void CTimeThread::setSystemTime(time_t tim) void CTimeThread::setSystemTime(time_t tim)
{ {
struct timeval tv; struct timeval tv;
struct tm t;
time_t now = time(NULL); time_t now = time(NULL);
struct tm *tmTime = localtime(&now); struct tm *tmTime = localtime_r(&now, &t);
gettimeofday(&tv, NULL); gettimeofday(&tv, NULL);
timediff = (int64_t)tim * (int64_t)1000000 - (tv.tv_usec + tv.tv_sec * (int64_t)1000000); timediff = int64_t(tim * 1000000 - (tv.tv_usec + tv.tv_sec * 1000000));
xprintf("%s: timediff %" PRId64 ", current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", name.c_str(), timediff, xprintf("%s: timediff %" PRId64 ", current: %02d.%02d.%04d %02d:%02d:%02d, dvb: %s", name.c_str(), timediff,
tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900, tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900,
@@ -1392,8 +1392,8 @@ void CTimeThread::setSystemTime(time_t tim)
return; return;
if (timeset && abs(tim - tv.tv_sec) < 120) { /* abs() is int */ if (timeset && abs(tim - tv.tv_sec) < 120) { /* abs() is int */
struct timeval oldd; struct timeval oldd;
tv.tv_sec = timediff / 1000000LL; tv.tv_sec = time_t(timediff / 1000000LL);
tv.tv_usec = timediff % 1000000LL; tv.tv_usec = suseconds_t(timediff % 1000000LL);
if (adjtime(&tv, &oldd)) if (adjtime(&tv, &oldd))
xprintf("adjtime(%d, %d) failed: %m\n", (int)tv.tv_sec, (int)tv.tv_usec); xprintf("adjtime(%d, %d) failed: %m\n", (int)tv.tv_sec, (int)tv.tv_usec);
else { else {