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

Harlan Stenn stenn at whimsy.udel.edu
Mon Jun 27 07:24:59 UTC 2005


This BitKeeper patch contains the following changesets:
stenn at whimsy.udel.edu|ChangeSet|20050627072338|40037

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# ID:	stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
# User:	stenn
# Host:	whimsy.udel.edu
# Root:	/backroom/ntp-dev

#
#--- 1.107/ntpd/ntp_loopfilter.c	2005-05-17 01:10:34 -04:00
#+++ 1.108/ntpd/ntp_loopfilter.c	2005-06-27 03:23:15 -04:00
#@@ -454,8 +454,7 @@
# 			 */
# 			if (ULOGTOD(sys_poll) > allan_xpt / 2) {
# 				dtemp = CLOCK_FLL - sys_poll;
#-				flladj = (fp_offset - last_base -
#-				    clock_offset) /
#+				flladj = (fp_offset - clock_offset) /
# 				    (max(mu, allan_xpt) * dtemp);
# 			}
# 
#@@ -465,7 +464,7 @@
# 			 * interval and poll interval. This allows
# 			 * oversampling, but not undersampling.
# 			 */ 
#-			etemp = min(mu, (u_long)ULOGTOD(sys_poll));
#+			etemp = max(mu, (u_long)ULOGTOD(sys_poll));
# 			dtemp = 4 * CLOCK_PLL * ULOGTOD(sys_poll);
# 			plladj = fp_offset * etemp / (dtemp * dtemp);
# 			break;
#
#--- 1.223/ntpd/ntp_proto.c	2005-05-28 04:44:42 -04:00
#+++ 1.224/ntpd/ntp_proto.c	2005-06-27 03:23:13 -04:00
#@@ -1598,7 +1598,7 @@
# 	 */
# 	for (i = 1; i < NTP_SHIFT; i++) {
# 		for (j = 0; j < i; j++) {
#-			if (dst[j] > dst[i]) {
#+			if (dst[j] > dst[i] + LOGTOD(sys_precision)) {
# 				k = ord[j];
# 				ord[j] = ord[i];
# 				ord[i] = k;
#

# Diff checksum=1ef419e2


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20050624012416|40046
D 1.1400 05/06/27 03:23:38-04:00 stenn at whimsy.udel.edu +2 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes from Dave Mills
K 40037
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntp_loopfilter.c|19990526004817|01635|3aed0663 stenn at whimsy.udel.edu|ntpd/ntp_loopfilter.c|20050627072315|47538
> stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663 stenn at whimsy.udel.edu|ntpd/ntp_proto.c|20050627072313|13842

== ntpd/ntp_loopfilter.c ==
stenn at whimsy.udel.edu|ntpd/ntp_loopfilter.c|19990526004817|01635|3aed0663
stenn at whimsy.udel.edu|ntpd/ntp_loopfilter.c|20050517051034|48729
D 1.108 05/06/27 03:23:15-04:00 stenn at whimsy.udel.edu +2 -3
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes from Dave Mills
K 47538
O -rw-rw-r--
P ntpd/ntp_loopfilter.c
------------------------------------------------

D457 2
I458 1
				flladj = (fp_offset - clock_offset) /
D468 1
I468 1
			etemp = max(mu, (u_long)ULOGTOD(sys_poll));

== ntpd/ntp_proto.c ==
stenn at whimsy.udel.edu|ntpd/ntp_proto.c|19990526004817|01635|3aed0663
stenn at whimsy.udel.edu|ntpd/ntp_proto.c|20050528084442|11779
D 1.224 05/06/27 03:23:13-04:00 stenn at whimsy.udel.edu +1 -1
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Fixes from Dave Mills
K 13842
O -rw-rw-r--
P ntpd/ntp_proto.c
------------------------------------------------

D1601 1
I1601 1
			if (dst[j] > dst[i] + LOGTOD(sys_precision)) {

# Patch checksum=5442f1e4


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