mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 07:51:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

sectionsd: only step time if difference is > 2min

Browse Source 
in order to avoid unnecessary system time jumps, only step time
if the difference is bigger than 120 seconds, else use adjtime

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
This commit is contained in:
Stefan Seyfried
2013-02-17 15:34:27 +01:00
committed by Jacek Jendrzej
parent f8cd0ac2f7
commit c5ef1bf14c
1 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eitd/sectionsd.cpp
View File

@@ -1279,6 +1279,7 @@ void CTimeThread::sendTimeEvent(bool ntp, time_t tim)
eventServer->sendEvent(CSectionsdClient::EVT_TIMESET, CEventServer::INITID_SECTIONSD, &actTime, sizeof(actTime) ); eventServer->sendEvent(CSectionsdClient::EVT_TIMESET, CEventServer::INITID_SECTIONSD, &actTime, sizeof(actTime) );
#endif #endif
if(ntp || tim) {} if(ntp || tim) {}
if (timediff)
eventServer->sendEvent(CSectionsdClient::EVT_TIMESET, CEventServer::INITID_SECTIONSD, &timediff, sizeof(timediff)); eventServer->sendEvent(CSectionsdClient::EVT_TIMESET, CEventServer::INITID_SECTIONSD, &timediff, sizeof(timediff));
setTimeSet(); setTimeSet();
} }
@@ -1313,11 +1314,26 @@ void CTimeThread::setSystemTime(time_t tim)
tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900, tmTime->tm_mday, tmTime->tm_mon+1, tmTime->tm_year+1900,
tmTime->tm_hour, tmTime->tm_min, tmTime->tm_sec, ctime(&tim)); tmTime->tm_hour, tmTime->tm_min, tmTime->tm_sec, ctime(&tim));
#if 0
/* if new time less than current for less than 1 second, ignore */ /* if new time less than current for less than 1 second, ignore */
if(timediff < 0 && timediff > (int64_t) -1000000) { if(timediff < 0 && timediff > (int64_t) -1000000) {
timediff = 0; timediff = 0;
return; return;
} }
#endif
if (timediff == 0) /* very unlikely... :-) */
return;
if (abs(timediff) < 120000000LL) {
struct timeval oldd;
tv.tv_sec = timediff / 1000000LL;
tv.tv_usec = timediff % 1000000LL;
if (adjtime(&tv, &oldd))
perror("adjtime");
xprintf("difference is < 120s, using adjtime(%d, %d). oldd(%d, %d)\n",
(int)tv.tv_sec, (int)tv.tv_usec, (int)oldd.tv_sec, (int)oldd.tv_usec);
timediff = 0;
return;
}
tv.tv_sec = tim; tv.tv_sec = tim;
tv.tv_usec = 0; tv.tv_usec = 0;