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

Remove resid_freq and resid_skew from source report

Browse source 
They were not printed and they are also in sourcestats report.
This commit is contained in:
Miroslav Lichvar 2009-12-12 18:36:32 +01:00
parent b49470117d
commit 5b1a8705cf
5 changed files with 1 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
candm.h
View file

@ -333,7 +333,7 @@ typedef struct {
Version 4 : IPv6 addressing added, 64-bit time values, sourcestats Version 4 : IPv6 addressing added, 64-bit time values, sourcestats
and tracking reports extended, added flags to NTP source request, and tracking reports extended, added flags to NTP source request,
replaced fixed-point format with floating-point trimmed source report, replaced fixed-point format with floating-point
*/ */
@ -476,8 +476,6 @@ typedef struct {
uint32_t latest_meas_err; uint32_t latest_meas_err;
int32_t est_offset; int32_t est_offset;
uint32_t est_offset_err; uint32_t est_offset_err;
int32_t resid_freq;
uint32_t resid_skew;
int32_t EOR; int32_t EOR;
} RPY_Source_Data; } RPY_Source_Data;

3
client.c
View file

@ -1539,7 +1539,6 @@ process_cmd_sources(char *line)
uint32_t latest_meas_ago; uint32_t latest_meas_ago;
uint16_t poll, stratum; uint16_t poll, stratum;
uint16_t state, mode; uint16_t state, mode;
double resid_freq, resid_skew;
char hostname_buf[32]; char hostname_buf[32];
/* Check whether to output verbose headers */ /* Check whether to output verbose headers */
@ -1581,8 +1580,6 @@ process_cmd_sources(char *line)
latest_meas_err = ntohl(reply.data.source_data.latest_meas_err); latest_meas_err = ntohl(reply.data.source_data.latest_meas_err);
est_offset = ntohl(reply.data.source_data.est_offset); est_offset = ntohl(reply.data.source_data.est_offset);
est_offset_err = ntohl(reply.data.source_data.est_offset_err); est_offset_err = ntohl(reply.data.source_data.est_offset_err);
resid_freq = (double) ((long) ntohl(reply.data.source_data.resid_freq)) * 1.0e-3;
resid_skew = (double) (ntohl(reply.data.source_data.resid_skew)) * 1.0e-3;
if (mode == RPY_SD_MD_REF) { if (mode == RPY_SD_MD_REF) {
snprintf(hostname_buf, sizeof(hostname_buf), "%s", UTI_RefidToString(ip_addr.addr.in4)); snprintf(hostname_buf, sizeof(hostname_buf), "%s", UTI_RefidToString(ip_addr.addr.in4));

2
cmdmon.c
View file

@ -1045,8 +1045,6 @@ handle_source_data(CMD_Request *rx_message, CMD_Reply *tx_message)
tx_message->data.source_data.latest_meas_err = htonl(report.latest_meas_err); tx_message->data.source_data.latest_meas_err = htonl(report.latest_meas_err);
tx_message->data.source_data.est_offset = htonl(report.est_offset); tx_message->data.source_data.est_offset = htonl(report.est_offset);
tx_message->data.source_data.est_offset_err = htonl(report.est_offset_err); tx_message->data.source_data.est_offset_err = htonl(report.est_offset_err);
tx_message->data.source_data.resid_freq = htonl(report.resid_freq);
tx_message->data.source_data.resid_skew = htonl(report.resid_skew);
} else { } else {
tx_message->status = htons(STT_NOSUCHSOURCE); tx_message->status = htons(STT_NOSUCHSOURCE);

2
reports.h
View file

@ -49,8 +49,6 @@ typedef struct {
unsigned long latest_meas_err; /* us */ unsigned long latest_meas_err; /* us */
long est_offset; /* us */ long est_offset; /* us */
unsigned long est_offset_err; /* us */ unsigned long est_offset_err; /* us */
long resid_freq; /* ppm * 1000 */
unsigned long resid_skew; /* ppm * 1000 */
} RPT_SourceReport ; } RPT_SourceReport ;
typedef struct { typedef struct {

6
sourcestats.c
View file

@ -869,13 +869,9 @@ SST_DoSourceReport(SST_Stats inst, RPT_SourceReport *report, struct timeval *now
(0.5*inst->root_delays[nb] + inst->root_dispersions[nb])); (0.5*inst->root_delays[nb] + inst->root_dispersions[nb]));
report->est_offset = (long)(0.5 + 1.0e6 * est_offset); report->est_offset = (long)(0.5 + 1.0e6 * est_offset);
report->est_offset_err = (unsigned long) (0.5 + 1.0e6 * est_err); report->est_offset_err = (unsigned long) (0.5 + 1.0e6 * est_err);
report->resid_freq = (long) (0.5 * 1.0e9 * inst->estimated_frequency);
report->resid_skew = (unsigned long) (0.5 + 1.0e9 * inst->skew);
} else { } else {
report->est_offset = report->latest_meas; report->est_offset = report->latest_meas;
report->est_offset_err = report->latest_meas_err; report->est_offset_err = report->latest_meas_err;
report->resid_freq = 0;
report->resid_skew = 0;
} }
} else { } else {
report->latest_meas_ago = 86400 * 365 * 10; report->latest_meas_ago = 86400 * 365 * 10;
@ -885,8 +881,6 @@ SST_DoSourceReport(SST_Stats inst, RPT_SourceReport *report, struct timeval *now
report->stratum = 0; report->stratum = 0;
report->est_offset = 0; report->est_offset = 0;
report->est_offset_err = 0; report->est_offset_err = 0;
report->resid_freq = 0;
report->resid_skew = 0;
} }
} }