white-rabbit: change initial jump to correct time for non-wr slave

Commit 06cb0670 time-wrs: implement time_set() is changin the seconds leaving the fractional part alone. However, the servo won't time-set again, but will rather converge, and this takes time. We now adjust nanoseconds first, so the servo will still notice a more-than-one-second error and will call our time-set again. Thus, we jump to proper time in a few seconds instead of slowly converging from far away. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>

white-rabbit: change initial jump to correct time for non-wr slave
Commit 06cb0670 time-wrs: implement time_set() is changin the seconds leaving the fractional part alone. However, the servo won't time-set again, but will rather converge, and this takes time. We now adjust nanoseconds first, so the servo will still notice a more-than-one-second error and will call our time-set again. Thus, we jump to proper time in a few seconds instead of slowly converging from far away. Signed-off-by: Alessandro Rubini <rubini@gnudd.com>
d16453c4 · Alessandro Rubini · e89573a3 · d16453c4
Commit d16453c4 authored Sep 20, 2013 by Alessandro Rubini
Hide whitespace changes
Inline Side-by-side

Showing with 20 additions and 8 deletions

wrs-time.c time-wrs/wrs-time.c +20 -8

No files found.
--- a/time-wrs/wrs-time.c
+++ b/time-wrs/wrs-time.c
@@ -197,7 +197,7 @@ static int wrs_time_get(struct pp_instance *ppi, TimeInternal *t)

 static int32_t wrs_time_set(struct pp_instance *ppi, TimeInternal *t)
 {
-	int64_t offset_sec;
+	TimeInternal diff;
 	/*
 	 * This is almost unused in ppsi, only proto-standard/servo.c
 	 * calls it, at initialization time, when the offset is bigger
@@ -206,16 +206,28 @@ static int32_t wrs_time_set(struct pp_instance *ppi, TimeInternal *t)
 	 */
 	pp_diag(ppi, time, 1, "%s: (weird) %9li.%09li\n", __func__,
 		(long)t->seconds, (long)t->nanoseconds);
-
 	/* We have no way to get the WR time, currently. So use our T3 */
-	offset_sec = (long long)t->seconds - (long long)ppi->t3.seconds;
-	pp_diag(ppi, time, 1, "%s: adjusting seconds: %li\n", __func__,
-		(long)offset_sec);
-	wrs_adjust_counters(offset_sec, 0);
+	sub_TimeInternal(&diff, t, &ppi->t3);

-	/* Set unix time anyways */
+	/*
+	 * We can adjust nanoseconds or seconds, but not both at the
+	 * same time. When an adjustment is in progress we can't do
+	 * the other.  So make nanoseconds first if > 10ms, and the
+	 * servo will call us again later for the seconds part.
+	 */
+	if (abs(diff.nanoseconds) > 10 * 1000 * 1000) {
+		pp_diag(ppi, time, 1, "%s: adjusting nanoseconds: %li\n",
+			__func__, (long)diff.nanoseconds);
+		wrs_adjust_counters(0, diff.nanoseconds);
+		return 0;
+	}
+	pp_diag(ppi, time, 1, "%s: adjusting seconds: %li\n",
+		__func__, (long)diff.seconds);
+	wrs_adjust_counters(diff.seconds, 0);
+
+	/* Finally, set unix time too */
 	unix_time_ops.set(ppi, t);
-	return -ENOTSUP;
+	return 0;
 }

 static int wrs_time_adjust_offset(struct pp_instance *ppi, long offset_ns)