chao
/
linuxptp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Simplify UTC tracking. 

The clock code uses two different variables to store the TAI-UTC
offset.  One variable represents the compile time, configuration file,
or command line initial UTC offset, while the other is used when
taking on the GM role and is settable at run time.  However, making
this distinction makes no sense.  This patch simplifies and clarifies
the code by using a single variable for the offset.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
master
Richard Cochran 2017-07-08 21:29:23 +02:00
parent 7546434030
commit 97e4242361
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
clock.c
View File

@ -101,8 +101,7 @@ struct clock {
int utc_offset_set; int utc_offset_set;
int leap_set; int leap_set;
int kernel_leap; int kernel_leap;
int utc_offset; /* grand master role */ int utc_offset;
int current_utc_offset; /* UTC offset fallback */
int time_flags; /* grand master role */ int time_flags; /* grand master role */
int time_source; /* grand master role */ int time_source; /* grand master role */
enum servo_state servo_state; enum servo_state servo_state;
@ -656,7 +655,7 @@ static void clock_update_slave(struct clock *c)
if (!(c->tds.flags & PTP_TIMESCALE)) { if (!(c->tds.flags & PTP_TIMESCALE)) {
pr_warning("foreign master not using PTP timescale"); pr_warning("foreign master not using PTP timescale");
} }
if (c->tds.currentUtcOffset < c->current_utc_offset) { if (c->tds.currentUtcOffset < c->utc_offset) {
pr_warning("running in a temporal vortex"); pr_warning("running in a temporal vortex");
} }
} }
@ -672,10 +671,10 @@ static int clock_utc_correct(struct clock *c, tmv_t ingress)
if (c->tds.flags & UTC_OFF_VALID && c->tds.flags & TIME_TRACEABLE) { if (c->tds.flags & UTC_OFF_VALID && c->tds.flags & TIME_TRACEABLE) {
utc_offset = c->tds.currentUtcOffset; utc_offset = c->tds.currentUtcOffset;
} else if (c->tds.currentUtcOffset > c->current_utc_offset) { } else if (c->tds.currentUtcOffset > c->utc_offset) {
utc_offset = c->tds.currentUtcOffset; utc_offset = c->tds.currentUtcOffset;
} else { } else {
utc_offset = c->current_utc_offset; utc_offset = c->utc_offset;
} }
if (c->tds.flags & LEAP_61) { if (c->tds.flags & LEAP_61) {
@ -992,7 +991,7 @@ struct clock *clock_create(enum clock_type type, struct config *config,
c->freq_est_interval = config_get_int(config, NULL, "freq_est_interval"); c->freq_est_interval = config_get_int(config, NULL, "freq_est_interval");
c->grand_master_capable = config_get_int(config, NULL, "gmCapable"); c->grand_master_capable = config_get_int(config, NULL, "gmCapable");
c->kernel_leap = config_get_int(config, NULL, "kernel_leap"); c->kernel_leap = config_get_int(config, NULL, "kernel_leap");
c->utc_offset = c->current_utc_offset = config_get_int(config, NULL, "utc_offset"); c->utc_offset = config_get_int(config, NULL, "utc_offset");
c->time_source = config_get_int(config, NULL, "timeSource"); c->time_source = config_get_int(config, NULL, "timeSource");
if (c->free_running) { if (c->free_running) {