faraphel/chrony
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rtc: let t_from_rtc/rtc_from_t operate on struct rtc_time directly

Browse source 
Both functions operate on struct tm even though the struct tm is only
used as intermediary format from struct rtc_time.

In the case of rtc_from_t, the code to convert from struct tm to struct
rtc is even duplicated.

Let's simplify code a bit by moving the struct translation code into
these conversion functions.
This commit is contained in:
Ahmad Fatoum 2024-07-12 16:12:44 +02:00
parent d4a4f89329
commit 56c6b90cb6
1 changed files with 32 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
rtc_linux.c
View file

@ -296,14 +296,25 @@ slew_samples
corresponding real time clock 'DMY HMS' form, taking account of corresponding real time clock 'DMY HMS' form, taking account of
whether the user runs his RTC on the local time zone or UTC */ whether the user runs his RTC on the local time zone or UTC */
static struct tm * static void
rtc_from_t(const time_t *t) rtc_from_t(const time_t *t, struct rtc_time *rtc_raw)
{ {
struct tm *rtc_tm;
if (rtc_on_utc) { if (rtc_on_utc) {
return gmtime(t); rtc_tm = gmtime(t);
} else { } else {
return localtime(t); rtc_tm = localtime(t);
} }
rtc_raw->tm_sec = rtc_tm->tm_sec;
rtc_raw->tm_min = rtc_tm->tm_min;
rtc_raw->tm_hour = rtc_tm->tm_hour;
rtc_raw->tm_mday = rtc_tm->tm_mday;
rtc_raw->tm_mon = rtc_tm->tm_mon;
rtc_raw->tm_year = rtc_tm->tm_year;
rtc_raw->tm_wday = rtc_tm->tm_wday;
rtc_raw->tm_yday = rtc_tm->tm_yday;
rtc_raw->tm_isdst = rtc_tm->tm_isdst;
} }
/* ================================================== */ /* ================================================== */
@ -341,14 +352,24 @@ rtc_from_t(const time_t *t)
*/ */
static time_t static time_t
t_from_rtc(struct tm *stm) { t_from_rtc(struct rtc_time *rtc_raw)
struct tm temp1, temp2, *tm; {
struct tm rtc_tm, temp1, temp2, *tm;
long diff; long diff;
time_t t1, t2; time_t t1, t2;
temp1 = *stm; /* Convert to seconds since 1970 */
rtc_tm.tm_sec = rtc_raw->tm_sec;
rtc_tm.tm_min = rtc_raw->tm_min;
rtc_tm.tm_hour = rtc_raw->tm_hour;
rtc_tm.tm_mday = rtc_raw->tm_mday;
rtc_tm.tm_mon = rtc_raw->tm_mon;
rtc_tm.tm_year = rtc_raw->tm_year;
rtc_tm.tm_wday = 0;
temp1 = rtc_tm;
temp1.tm_isdst = 0; temp1.tm_isdst = 0;
t1 = mktime(&temp1); t1 = mktime(&temp1);
tm = rtc_on_utc ? gmtime(&t1) : localtime(&t1); tm = rtc_on_utc ? gmtime(&t1) : localtime(&t1);
@ -586,21 +607,10 @@ measurement_timeout(void *any)
static void static void
set_rtc(time_t new_rtc_time) set_rtc(time_t new_rtc_time)
{ {
struct tm rtc_tm;
struct rtc_time rtc_raw; struct rtc_time rtc_raw;
int status; int status;
rtc_tm = *rtc_from_t(&new_rtc_time); rtc_from_t(&new_rtc_time, &rtc_raw);
rtc_raw.tm_sec = rtc_tm.tm_sec;
rtc_raw.tm_min = rtc_tm.tm_min;
rtc_raw.tm_hour = rtc_tm.tm_hour;
rtc_raw.tm_mday = rtc_tm.tm_mday;
rtc_raw.tm_mon = rtc_tm.tm_mon;
rtc_raw.tm_year = rtc_tm.tm_year;
rtc_raw.tm_wday = rtc_tm.tm_wday;
rtc_raw.tm_yday = rtc_tm.tm_yday;
rtc_raw.tm_isdst = rtc_tm.tm_isdst;
status = ioctl(fd, RTC_SET_TIME, &rtc_raw); status = ioctl(fd, RTC_SET_TIME, &rtc_raw);
if (status < 0) { if (status < 0) {
@ -757,7 +767,6 @@ read_from_device(int fd_, int event, void *any)
unsigned long data; unsigned long data;
struct timespec sys_time; struct timespec sys_time;
struct rtc_time rtc_raw; struct rtc_time rtc_raw;
struct tm rtc_tm;
time_t rtc_t; time_t rtc_t;
int error = 0; int error = 0;
@ -796,15 +805,7 @@ read_from_device(int fd_, int event, void *any)
} }
/* Convert RTC time into a struct timespec */ /* Convert RTC time into a struct timespec */
rtc_tm.tm_sec = rtc_raw.tm_sec; rtc_t = t_from_rtc(&rtc_raw);
rtc_tm.tm_min = rtc_raw.tm_min;
rtc_tm.tm_hour = rtc_raw.tm_hour;
rtc_tm.tm_mday = rtc_raw.tm_mday;
rtc_tm.tm_mon = rtc_raw.tm_mon;
rtc_tm.tm_year = rtc_raw.tm_year;
rtc_tm.tm_wday = 0;
rtc_t = t_from_rtc(&rtc_tm);
if (rtc_t == (time_t)(-1)) { if (rtc_t == (time_t)(-1)) {
error = 1; error = 1;
@ -922,7 +923,6 @@ RTC_Linux_TimePreInit(time_t driftfile_time)
{ {
int fd, status; int fd, status;
struct rtc_time rtc_raw, rtc_raw_retry; struct rtc_time rtc_raw, rtc_raw_retry;
struct tm rtc_tm;
time_t rtc_t; time_t rtc_t;
double accumulated_error, sys_offset; double accumulated_error, sys_offset;
struct timespec new_sys_time, old_sys_time; struct timespec new_sys_time, old_sys_time;
@ -955,14 +955,7 @@ RTC_Linux_TimePreInit(time_t driftfile_time)
if (status >= 0) { if (status >= 0) {
/* Convert to seconds since 1970 */ /* Convert to seconds since 1970 */
rtc_tm.tm_sec = rtc_raw.tm_sec; rtc_t = t_from_rtc(&rtc_raw);
rtc_tm.tm_min = rtc_raw.tm_min;
rtc_tm.tm_hour = rtc_raw.tm_hour;
rtc_tm.tm_mday = rtc_raw.tm_mday;
rtc_tm.tm_mon = rtc_raw.tm_mon;
rtc_tm.tm_year = rtc_raw.tm_year;
rtc_t = t_from_rtc(&rtc_tm);
if (rtc_t != (time_t)(-1)) { if (rtc_t != (time_t)(-1)) {