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

sourcestats: extend array holding peer delays

Browse source 
Keep the same number of peer delays as offsets. This will be needed when
peer delay is included in offset correction.
This commit is contained in:
Miroslav Lichvar 2016-08-08 15:51:51 +02:00
parent f7b8cd1a09
commit 507a01ab17
1 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
sourcestats.c
View file

@ -72,8 +72,8 @@ struct SST_Stats_Record {
buffer. */ buffer. */
int n_samples; int n_samples;
/* Number of extra samples stored in sample_times and offsets arrays that are /* Number of extra samples stored in sample_times, offsets and peer_delays
used to extend runs test */ arrays that are used to extend the runs test */
int runs_samples; int runs_samples;
/* The index of the newest sample */ /* The index of the newest sample */
@ -131,7 +131,7 @@ struct SST_Stats_Record {
/* This is an array of peer delays, in seconds, being the roundtrip /* This is an array of peer delays, in seconds, being the roundtrip
measurement delay to the peer */ measurement delay to the peer */
double peer_delays[MAX_SAMPLES]; double peer_delays[MAX_SAMPLES * REGRESS_RUNS_RATIO];
/* This is an array of peer dispersions, being the skew and local /* This is an array of peer dispersions, being the skew and local
precision dispersion terms from sampling the peer */ precision dispersion terms from sampling the peer */
@ -282,14 +282,14 @@ SST_AccumulateSample(SST_Stats inst, struct timeval *sample_time,
inst->sample_times[n] = *sample_time; inst->sample_times[n] = *sample_time;
inst->offsets[n] = offset; inst->offsets[n] = offset;
inst->orig_offsets[m] = offset; inst->orig_offsets[m] = offset;
inst->peer_delays[m] = peer_delay; inst->peer_delays[n] = peer_delay;
inst->peer_dispersions[m] = peer_dispersion; inst->peer_dispersions[m] = peer_dispersion;
inst->root_delays[m] = root_delay; inst->root_delays[m] = root_delay;
inst->root_dispersions[m] = root_dispersion; inst->root_dispersions[m] = root_dispersion;
inst->strata[m] = stratum; inst->strata[m] = stratum;
if (!inst->n_samples || inst->peer_delays[m] < inst->peer_delays[inst->min_delay_sample]) if (!inst->n_samples || inst->peer_delays[n] < inst->peer_delays[inst->min_delay_sample])
inst->min_delay_sample = m; inst->min_delay_sample = n;
++inst->n_samples; ++inst->n_samples;
} }
@ -376,10 +376,10 @@ find_min_delay_sample(SST_Stats inst)
{ {
int i, index; int i, index;
inst->min_delay_sample = get_buf_index(inst, 0); inst->min_delay_sample = get_runsbuf_index(inst, -inst->runs_samples);
for (i = 1; i < inst->n_samples; i++) { for (i = -inst->runs_samples + 1; i < inst->n_samples; i++) {
index = get_buf_index(inst, i); index = get_runsbuf_index(inst, i);
if (inst->peer_delays[index] < inst->peer_delays[inst->min_delay_sample]) if (inst->peer_delays[index] < inst->peer_delays[inst->min_delay_sample])
inst->min_delay_sample = index; inst->min_delay_sample = index;
} }
@ -425,7 +425,8 @@ SST_DoNewRegression(SST_Stats inst)
for (i = 0, mean_distance = 0.0, min_distance = DBL_MAX; i < inst->n_samples; i++) { for (i = 0, mean_distance = 0.0, min_distance = DBL_MAX; i < inst->n_samples; i++) {
j = get_buf_index(inst, i); j = get_buf_index(inst, i);
peer_distances[i] = 0.5 * inst->peer_delays[j] + inst->peer_dispersions[j]; peer_distances[i] = 0.5 * inst->peer_delays[get_runsbuf_index(inst, i)] +
inst->peer_dispersions[j];
mean_distance += peer_distances[i]; mean_distance += peer_distances[i];
if (peer_distances[i] < min_distance) { if (peer_distances[i] < min_distance) {
min_distance = peer_distances[i]; min_distance = peer_distances[i];
@ -563,7 +564,7 @@ SST_GetSelectionData(SST_Stats inst, struct timeval *now,
UTI_DiffTimevalsToDouble(&elapsed, now, &(inst->offset_time)); UTI_DiffTimevalsToDouble(&elapsed, now, &(inst->offset_time));
average_offset = inst->estimated_offset + inst->estimated_frequency * elapsed; average_offset = inst->estimated_offset + inst->estimated_frequency * elapsed;
if (fabs(average_offset - offset) <= if (fabs(average_offset - offset) <=
inst->peer_dispersions[j] + 0.5 * inst->peer_delays[j]) { inst->peer_dispersions[j] + 0.5 * inst->peer_delays[i]) {
average_ok = 1; average_ok = 1;
} else { } else {
average_ok = 0; average_ok = 0;
@ -755,7 +756,7 @@ SST_SaveToFile(SST_Stats inst, FILE *out)
(unsigned long) inst->sample_times[i].tv_usec, (unsigned long) inst->sample_times[i].tv_usec,
inst->offsets[i], inst->offsets[i],
inst->orig_offsets[j], inst->orig_offsets[j],
inst->peer_delays[j], inst->peer_delays[i],
inst->peer_dispersions[j], inst->peer_dispersions[j],
inst->root_delays[j], inst->root_delays[j],
inst->root_dispersions[j], inst->root_dispersions[j],