[ntp:bk-ntp-dev-send] BitKeeper diffs

Harlan Stenn stenn at whimsy.udel.edu
Sun Aug 31 03:15:54 UTC 2008


#### ChangeSet ####
2008-08-30 23:14:01-04:00, stenn at whimsy.udel.edu 
  Fix a corner case where a frequency update was reported but not set

==== ChangeLog ====
2008-08-30 23:13:47-04:00, stenn at whimsy.udel.edu +1 -0
  Fix a corner case where a frequency update was reported but not set

--- 1.211/ChangeLog	2008-08-30 22:09:11 -04:00
+++ 1.212/ChangeLog	2008-08-30 23:13:47 -04:00
@@ -1,4 +1,5 @@
 * Changes from Dave Mills:
+  Fix a corner case where a frequency update was reported but not set.
   When LEAP_NOTINSYNC->LEAP_NOWARNING, call crypto_update() if we have
   crypto_flags.
 (4.2.5p125) 2008/08/18 Released by Harlan Stenn <stenn at ntp.org>

==== ntpd/ntp_loopfilter.c ====
2008-08-30 23:13:14-04:00, stenn at whimsy.udel.edu +6 -5
  Fix a corner case where a frequency update was reported but not set

--- 1.146/ntpd/ntp_loopfilter.c	2008-07-16 05:19:07 -04:00
+++ 1.147/ntpd/ntp_loopfilter.c	2008-08-30 23:13:14 -04:00
@@ -124,7 +124,7 @@ double	clock_codec;		/* audio codec freq
 u_long	clock_epoch;		/* interval since last update */
 u_int	sys_tai;		/* TAI offset from UTC */
 static void rstclock (int, double); /* transition function */
-static void direct_freq(double); /* direct set frequency */
+static double direct_freq(double); /* direct set frequency */
 static void set_freq(double);	/* set frequency */
 
 #ifdef KERNEL_PLL
@@ -346,7 +346,7 @@ local_clock(
 			if (clock_epoch < clock_minstep)
 				return (0);
 
-			direct_freq(fp_offset);
+			clock_frequency = direct_freq(fp_offset);
 
 			/* fall through to S_SPIK */
 
@@ -447,7 +447,7 @@ local_clock(
 			if (clock_epoch < clock_minstep)
 				return (0);
 
-			direct_freq(fp_offset);
+			clock_frequency = direct_freq(fp_offset);
 			rstclock(EVNT_SYNC, 0);
 			break;
 
@@ -765,7 +765,8 @@ rstclock(
  * interval and residual frequency component. At the same time the
  * frequenchy file is armed for update at the next hourly stats.
  */
-static void direct_freq(
+static double
+direct_freq(
 	double	fp_offset
 	)
 {
@@ -788,7 +789,7 @@ static void direct_freq(
 #endif /* KERNEL_PLL */
 	set_freq((fp_offset - clock_offset) / clock_epoch + drift_comp);
 	wander_resid = 0;
-	return;
+	return (drift_comp);
 }
 
 


More information about the bk-ntp-dev-send mailing list