Convert TRACEON LOG messages to DEBUG_LOG

This commit is contained in:
Miroslav Lichvar
2013-11-26 18:53:24 +01:00
parent 4bbc5520b8
commit 1c3aff37de
9 changed files with 36 additions and 99 deletions

View File

@@ -249,10 +249,8 @@ RCL_AddRefclock(RefclockParameters *params)
inst->source = SRC_CreateNewInstance(inst->ref_id, SRC_REFCLOCK, params->sel_option, NULL);
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock %s added poll=%d dpoll=%d filter=%d",
DEBUG_LOG(LOGF_Refclock, "refclock %s added poll=%d dpoll=%d filter=%d",
params->driver_name, inst->poll, inst->driver_poll, params->filter_length);
#endif
n_sources++;
Free(params->driver_name);
@@ -412,18 +410,14 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second)
if (!filter_get_last_sample(&refclocks[instance->lock_ref].filter,
&ref_sample_time, &ref_offset, &ref_dispersion)) {
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored no ref sample");
#endif
DEBUG_LOG(LOGF_Refclock, "refclock pulse ignored no ref sample");
return 0;
}
UTI_DiffTimevalsToDouble(&sample_diff, &cooked_time, &ref_sample_time);
if (fabs(sample_diff) >= 2.0 / rate) {
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored samplediff=%.9f",
DEBUG_LOG(LOGF_Refclock, "refclock pulse ignored samplediff=%.9f",
sample_diff);
#endif
return 0;
}
@@ -436,17 +430,13 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second)
offset += shift;
if (fabs(ref_offset - offset) + ref_dispersion + dispersion >= 0.2 / rate) {
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored offdiff=%.9f refdisp=%.9f disp=%.9f",
DEBUG_LOG(LOGF_Refclock, "refclock pulse ignored offdiff=%.9f refdisp=%.9f disp=%.9f",
ref_offset - offset, ref_dispersion, dispersion);
#endif
return 0;
}
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse second=%.9f offset=%.9f offdiff=%.9f samplediff=%.9f",
DEBUG_LOG(LOGF_Refclock, "refclock pulse second=%.9f offset=%.9f offdiff=%.9f samplediff=%.9f",
second, offset, ref_offset - offset, sample_diff);
#endif
} else {
struct timeval ref_time;
int is_synchronised, stratum;
@@ -461,10 +451,8 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second)
distance = fabs(root_delay) / 2 + root_dispersion;
if (!is_synchronised || distance >= 0.5 / rate) {
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored second=%.9f sync=%d dist=%.9f",
DEBUG_LOG(LOGF_Refclock, "refclock pulse ignored second=%.9f sync=%d dist=%.9f",
second, is_synchronised, distance);
#endif
/* Drop also all stored samples */
filter_reset(&instance->filter);
return 0;
@@ -493,10 +481,8 @@ valid_sample_time(RCL_Instance instance, struct timeval *tv)
LCL_ReadRawTime(&raw_time);
UTI_DiffTimevalsToDouble(&diff, &raw_time, tv);
if (diff < 0.0 || diff > 1 << (instance->poll + 1)) {
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "refclock sample not valid age=%.f tv=%s",
DEBUG_LOG(LOGF_Refclock, "refclock sample not valid age=%.f tv=%s",
diff, UTI_TimevalToString(tv));
#endif
return 0;
}
return 1;
@@ -683,10 +669,8 @@ filter_add_sample(struct MedianFilter *filter, struct timeval *sample_time, doub
filter->samples[filter->index].offset = offset;
filter->samples[filter->index].dispersion = dispersion;
#ifdef TRACEON
LOG(LOGS_INFO, LOGF_Refclock, "filter sample %d t=%s offset=%.9f dispersion=%.9f",
DEBUG_LOG(LOGF_Refclock, "filter sample %d t=%s offset=%.9f dispersion=%.9f",
filter->index, UTI_TimevalToString(sample_time), offset, dispersion);
#endif
}
static int