DWS/chrony
1
0
Fork 0
mirror of https://gitlab.com/chrony/chrony.git synced 2025-12-03 16:55:07 -05:00
Code Issues Packages Projects Releases Wiki Activity

sourcestats: change ST_GetSelectionData() to return status directly

Browse Source 
For better consistency, indicate success (usable data) by returning 1
instead of setting a pointer parameter.
This commit is contained in:
Miroslav Lichvar
2025-11-03 12:44:58 +01:00
parent 5436618c05
commit 4659b574bf
3 changed files with 20 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sources.c
View File

@@ -1010,10 +1010,10 @@ SRC_SelectSource(SRC_Instance updated_inst)
n_unreach_sources++; n_unreach_sources++;
si = &sources[i]->sel_info; si = &sources[i]->sel_info;
SST_GetSelectionData(sources[i]->stats, &now, si->select_ok = SST_GetSelectionData(sources[i]->stats, &now,
&si->lo_limit, &si->hi_limit, &si->root_distance, &si->lo_limit, &si->hi_limit, &si->root_distance,
&si->std_dev, &first_sample_ago, &si->std_dev, &first_sample_ago,
&si->last_sample_ago, &si->select_ok); &si->last_sample_ago);
if (!si->select_ok) { if (!si->select_ok) {
++n_badstats_sources; ++n_badstats_sources;

29
sourcestats.c
View File

@@ -644,22 +644,16 @@ SST_GetFrequencyRange(SST_Stats inst,
/* ================================================== */ /* ================================================== */
void int
SST_GetSelectionData(SST_Stats inst, struct timespec *now, SST_GetSelectionData(SST_Stats inst, struct timespec *now, double *offset_lo_limit,
double *offset_lo_limit, double *offset_hi_limit, double *root_distance, double *std_dev,
double *offset_hi_limit, double *first_sample_ago, double *last_sample_ago)
double *root_distance,
double *std_dev,
double *first_sample_ago,
double *last_sample_ago,
int *select_ok)
{ {
double offset, sample_elapsed; double offset, sample_elapsed;
int i, j; int i, j;
if (!inst->n_samples) { if (!inst->n_samples) {
*select_ok = 0; return 0;
return;
} }
i = get_runsbuf_index(inst, inst->best_single_sample); i = get_runsbuf_index(inst, inst->best_single_sample);
@@ -680,19 +674,20 @@ SST_GetSelectionData(SST_Stats inst, struct timespec *now,
i = get_runsbuf_index(inst, inst->n_samples - 1); i = get_runsbuf_index(inst, inst->n_samples - 1);
*last_sample_ago = UTI_DiffTimespecsToDouble(now, &inst->sample_times[i]); *last_sample_ago = UTI_DiffTimespecsToDouble(now, &inst->sample_times[i]);
*select_ok = inst->regression_ok;
/* If maxsamples is too small to have a successful regression, enable the /* If maxsamples is too small to have a successful regression, enable the
selection as a special case for a fast update/print-once reference mode */ selection as a special case for a fast update/print-once reference mode */
if (!*select_ok && inst->n_samples < MIN_SAMPLES_FOR_REGRESS && if (!inst->regression_ok && inst->n_samples < MIN_SAMPLES_FOR_REGRESS &&
inst->n_samples == inst->max_samples) { inst->n_samples == inst->max_samples) {
*std_dev = CNF_GetMaxJitter(); *std_dev = CNF_GetMaxJitter();
*select_ok = 1; } else if (!inst->regression_ok) {
return 0;
} }
DEBUG_LOG("n=%d off=%f dist=%f sd=%f first_ago=%f last_ago=%f selok=%d", DEBUG_LOG("n=%d off=%f dist=%f sd=%f first_ago=%f last_ago=%f",
inst->n_samples, offset, *root_distance, *std_dev, inst->n_samples, offset, *root_distance, *std_dev,
*first_sample_ago, *last_sample_ago, *select_ok); *first_sample_ago, *last_sample_ago);
return 1;
} }
/* ================================================== */ /* ================================================== */

13
sourcestats.h
View File

@@ -67,15 +67,10 @@ extern void SST_DoNewRegression(SST_Stats inst);
extern void SST_GetFrequencyRange(SST_Stats inst, double *lo, double *hi); extern void SST_GetFrequencyRange(SST_Stats inst, double *lo, double *hi);
/* Get data needed for selection */ /* Get data needed for selection */
extern void extern int SST_GetSelectionData(SST_Stats inst, struct timespec *now,
SST_GetSelectionData(SST_Stats inst, struct timespec *now, double *offset_lo_limit, double *offset_hi_limit,
double *offset_lo_limit, double *root_distance, double *variance,
double *offset_hi_limit, double *first_sample_ago, double *last_sample_ago);
double *root_distance,
double *variance,
double *first_sample_ago,
double *last_sample_ago,
int *select_ok);
/* Get data needed when setting up tracking on this source */ /* Get data needed when setting up tracking on this source */
extern void extern void