refclock: don't compare sample time with samples from previous poll

This is an improvement of commit 8f85291d23.
This commit is contained in:
Miroslav Lichvar 2016-11-21 11:20:57 +01:00
parent 875b0e262c
commit 258bcc21b8

View file

@ -106,6 +106,7 @@ static void filter_reset(struct MedianFilter *filter);
static double filter_get_avg_sample_dispersion(struct MedianFilter *filter);
static void filter_add_sample(struct MedianFilter *filter, struct timespec *sample_time, double offset, double dispersion);
static int filter_get_last_sample(struct MedianFilter *filter, struct timespec *sample_time, double *offset, double *dispersion);
static int filter_get_samples(struct MedianFilter *filter);
static int filter_select_samples(struct MedianFilter *filter);
static int filter_get_sample(struct MedianFilter *filter, struct timespec *sample_time, double *offset, double *dispersion);
static void filter_slew_samples(struct MedianFilter *filter, struct timespec *when, double dfreq, double doffset);
@ -512,7 +513,8 @@ valid_sample_time(RCL_Instance instance, struct timespec *raw, struct timespec *
diff = UTI_DiffTimespecsToDouble(&now_raw, raw);
if (diff < 0.0 || diff > UTI_Log2ToDouble(instance->poll + 1) ||
(filter_get_last_sample(&instance->filter, &last_sample_time,
(filter_get_samples(&instance->filter) > 0 &&
filter_get_last_sample(&instance->filter, &last_sample_time,
&last_offset, &last_dispersion) &&
UTI_CompareTimespecs(&last_sample_time, cooked) >= 0)) {
DEBUG_LOG(LOGF_Refclock, "%s refclock sample not valid age=%.6f raw=%s cooked=%s",
@ -725,6 +727,12 @@ filter_get_last_sample(struct MedianFilter *filter, struct timespec *sample_time
return 1;
}
static int
filter_get_samples(struct MedianFilter *filter)
{
return filter->used;
}
static const struct FilterSample *tmp_sorted_array;
static int