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

samplefilt: drop last sample in SPF_DropSamples()

Browse source 
When SPF_DropSamples() is called, don't keep the last sample to be
retrieved by SPF_GetLastSample(). It should be kept only after
filtering.
This commit is contained in:
Miroslav Lichvar 2022-05-11 11:04:52 +02:00
parent 35220aac9d
commit e66f1df89d
2 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
samplefilt.c
View file

@ -170,11 +170,21 @@ SPF_GetAvgSampleDispersion(SPF_Instance filter)
/* ================================================== */ /* ================================================== */
void static void
SPF_DropSamples(SPF_Instance filter) drop_samples(SPF_Instance filter, int keep_last)
{ {
filter->index = -1; filter->index = -1;
filter->used = 0; filter->used = 0;
if (!keep_last)
filter->last = -1;
}
/* ================================================== */
void
SPF_DropSamples(SPF_Instance filter)
{
drop_samples(filter, 0);
} }
/* ================================================== */ /* ================================================== */
@ -405,7 +415,7 @@ SPF_GetFilteredSample(SPF_Instance filter, NTP_Sample *sample)
if (!combine_selected_samples(filter, n, sample)) if (!combine_selected_samples(filter, n, sample))
return 0; return 0;
SPF_DropSamples(filter); drop_samples(filter, 1);
return 1; return 1;
} }

1
test/unit/samplefilt.c
View file

@ -103,6 +103,7 @@ test_unit(void)
} else { } else {
SPF_DropSamples(filter); SPF_DropSamples(filter);
TEST_CHECK(filter->last < 0);
} }
TEST_CHECK(SPF_GetNumberOfSamples(filter) == 0); TEST_CHECK(SPF_GetNumberOfSamples(filter) == 0);