ChangeLog, ntp_refclock.h:

  * include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change
  to use most recent MAXSTAGE entries when the filter overflows (ie
  driver poking say once per second with poll > MAXSTAGE) rather
  than blocking after MAXSTAGE entries (turf oldest rather than turf
  most recent).
  From: John Woolner <vk1et@tpg.com.au>
ChangeLog, aclocal.m4, configure, configure.in:
  * configure.in: 4.0.99k40

bk: 3b11ae9dTS8WBsPXSyt7aI7A7-M7wA

diff --git a/ChangeLog b/ChangeLog
index cee7d4e4c844fb1b9ace7d7583c4c0004438dffb..aab55a4e10b607971658c3abcf6cc051904e98c8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2001-05-27  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+       * configure.in: 4.0.99k40
+
+       * include/ntp_refclock.h: Median Filter (SAMPLE - macro) - change
+       to use most recent MAXSTAGE entries when the filter overflows (ie
+       driver poking say once per second with poll > MAXSTAGE) rather
+       than blocking after MAXSTAGE entries (turf oldest rather than turf
+       most recent).
+       From: John Woolner <vk1et@tpg.com.au>
+
        * ntpd/refclock_true.c:
           a. Don't cream pp->a_lastcode when we get a <cr><lf> pair 
           b. Fix up pp->leap handling to work correctly 

diff --git a/configure b/configure
index 4c98c67220211379d4b4e8592a0589a9ef577ca4..f42908061b3fc5632b88ef0ed2454d9678a1af03 100755 (executable)
--- a/configure
+++ b/configure
@@ -1377,7 +1377,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=ntp
-VERSION=4.0.99k39
+VERSION=4.0.99k40
 
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"

diff --git a/configure.in b/configure.in
index f2b27ffc81e803f7e6f98650daa7e23b66a285cc..c3ebd7ada2f1ae108ee3b10f61d02c0764ec14ac 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CANONICAL_SYSTEM
 AC_DEFINE_UNQUOTED(STR_SYSTEM, "$target")
 AM_CONFIG_HEADER(config.h)
 AC_ARG_PROGRAM
-AM_INIT_AUTOMAKE(ntp, 4.0.99k39)
+AM_INIT_AUTOMAKE(ntp, 4.0.99k40)
 AC_PREREQ(2.49)
 
 ac_cv_var_oncore_ok=no

diff --git a/include/ntp_refclock.h b/include/ntp_refclock.h
index f436c0619dc65f4d19be3330351211a5fc1b9165..3995e9a1af7dc809dfe994a3dd587d702ed13452 100644 (file)
--- a/include/ntp_refclock.h
+++ b/include/ntp_refclock.h
@@ -44,10 +44,9 @@
 #define BSD_TTYS
 #endif /* SYSV_TTYS STREAM BSD_TTYS */
 
-#define SAMPLE(x)      if ((pp->coderecv + 1) % MAXSTAGE !=            \
-                           pp->codeproc % MAXSTAGE)                    \
-                               pp->filter[pp->coderecv++ % MAXSTAGE] = \
-                                   (x);
+#define SAMPLE(x)      pp->filter[pp->coderecv++ % MAXSTAGE] = (x); \
+                       if (pp->coderecv % MAXSTAGE == pp->codeproc % MAXSTAGE) \
+                               pp->codeproc++;
 
 /*
  * Macros to determine the clock type and unit numbers from a