Add refclock trace messages

diff --git a/refclock.c b/refclock.c
index fad2031a446e7aba7d073e39342515d9ac3ef337..c3754451712caef65ced981777df87705c114e08 100644 (file)
--- a/refclock.c
+++ b/refclock.c
@@ -249,9 +249,9 @@ RCL_AddRefclock(RefclockParameters *params)
 
   inst->source = SRC_CreateNewInstance(inst->ref_id, SRC_REFCLOCK, params->sel_option, NULL);
 
-#if 0
-  LOG(LOGS_INFO, LOGF_Refclock, "refclock added poll=%d dpoll=%d filter=%d",
-                 inst->poll, inst->driver_poll, params->filter_length);
+#ifdef TRACEON
+  LOG(LOGS_INFO, 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++;
 
@@ -411,12 +411,21 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second)
     double sample_diff, ref_offset, ref_dispersion, shift;
 
     if (!filter_get_last_sample(&refclocks[instance->lock_ref].filter,
-          &ref_sample_time, &ref_offset, &ref_dispersion))
+          &ref_sample_time, &ref_offset, &ref_dispersion)) {
+#ifdef TRACEON
+      LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored no ref sample");
+#endif
       return 0;
+    }
 
     UTI_DiffTimevalsToDouble(&sample_diff, &cooked_time, &ref_sample_time);
-    if (fabs(sample_diff) >= 2.0 / rate)
+    if (fabs(sample_diff) >= 2.0 / rate) {
+#ifdef TRACEON
+      LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored samplediff=%.9f",
+          sample_diff);
+#endif
       return 0;
+    }
 
     /* Align the offset to the reference sample */
     if ((ref_offset - offset) >= 0.0)
@@ -426,10 +435,15 @@ RCL_AddPulse(RCL_Instance instance, struct timeval *pulse_time, double second)
 
     offset += shift;
 
-    if (fabs(ref_offset - offset) + ref_dispersion + dispersion >= 0.2 / rate)
+    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",
+          ref_offset - offset, ref_dispersion, dispersion);
+#endif
       return 0;
+    }
 
-#if 0
+#ifdef TRACEON
     LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse second=%.9f offset=%.9f offdiff=%.9f samplediff=%.9f",
         second, offset, ref_offset - offset, sample_diff);
 #endif
@@ -447,8 +461,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) {
-#if 0
-      LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse dropped second=%.9f sync=%d dist=%.9f",
+#ifdef TRACEON
+      LOG(LOGS_INFO, LOGF_Refclock, "refclock pulse ignored second=%.9f sync=%d dist=%.9f",
           second, is_synchronised, distance);
 #endif
       /* Drop also all stored samples */
@@ -478,8 +492,13 @@ 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))
+  if (diff < 0.0 || diff > 1 << (instance->poll + 1)) {
+#ifdef TRACEON
+    LOG(LOGS_INFO, LOGF_Refclock, "refclock sample not valid age=%.f tv=%s",
+        diff, UTI_TimevalToString(tv));
+#endif
     return 0;
+  }
   return 1;
 }
 
@@ -663,6 +682,11 @@ filter_add_sample(struct MedianFilter *filter, struct timeval *sample_time, doub
   filter->samples[filter->index].sample_time = *sample_time;
   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",
+      filter->index, UTI_TimevalToString(sample_time), offset, dispersion);
+#endif
 }
 
 static int

diff --git a/refclock_pps.c b/refclock_pps.c
index 46027bcb3a4f05b5f9d55a1545e35597bae17002..e40009625471a5712cc00b8123c399c4b6e1e575 100644 (file)
--- a/refclock_pps.c
+++ b/refclock_pps.c
@@ -147,6 +147,10 @@ static int pps_poll(RCL_Instance instance)
   }
 
   if (seq == pps->last_seq || (ts.tv_sec == 0 && ts.tv_nsec == 0)) { 
+#ifdef TRACEON
+    LOG(LOGS_INFO, LOGF_Refclock, "PPS sample ignored seq=%lu ts=%lu.%09lu",
+        seq, ts.tv_sec, ts.tv_nsec);
+#endif
     return 0;
   }
 

diff --git a/refclock_shm.c b/refclock_shm.c
index acf2e52c29cb0753c9faefe61f9c468f9e0e5898..4925d9718d7945a2b72d6bc2b94bbb144dadb510 100644 (file)
--- a/refclock_shm.c
+++ b/refclock_shm.c
@@ -100,8 +100,9 @@ static int shm_poll(RCL_Instance instance)
   
   if ((t.mode == 1 && t.count != shm->count) ||
     !(t.mode == 0 || t.mode == 1) || !t.valid) {
-#if 0
-    LOG(LOGS_INFO, LOGF_Refclock, "sample ignored mode: %d count: %d valid: %d", t.mode, t.count, t.valid);
+#ifdef TRACEON
+    LOG(LOGS_INFO, LOGF_Refclock, "SHM sample ignored mode=%d count=%d valid=%d",
+        t.mode, t.count, t.valid);
 #endif
     return 0;
   }