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

Harlan Stenn stenn at mail.eecis.udel.edu
Thu Nov 10 00:57:12 PST 2005


This BitKeeper patch contains the following changesets:
stenn at pogo.udel.edu|ChangeSet|20051110085335|20345
kardel at pogo.udel.edu|ChangeSet|20051109221313|20559

# 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:	deacon.udel.edu
# Root:	/deacon/backroom/ntp-dev

#
#--- 1.36/ntpd/refclock_parse.c	2005-10-07 19:03:44 -04:00
#+++ 1.37/ntpd/refclock_parse.c	2005-11-09 16:00:26 -05:00
#@@ -1,7 +1,7 @@
# /*
#- * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.63 2005/10/07 22:10:25 kardel RELEASE_20051008_A
#+ * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.64 2005/11/09 20:44:47 kardel RELEASE_20051109_A
#  *
#- * refclock_parse.c,v 4.63 2005/10/07 22:10:25 kardel RELEASE_20051008_A
#+ * refclock_parse.c,v 4.64 2005/11/09 20:44:47 kardel RELEASE_20051109_A
#  *
#  * generic reference clock driver for several DCF/GPS/MSF/... receivers
#  *
#@@ -181,7 +181,7 @@
# #include "ascii.h"
# #include "ieee754io.h"
# 
#-static char rcsid[] = "refclock_parse.c,v 4.63 2005/10/07 22:10:25 kardel RELEASE_20051008_A";
#+static char rcsid[] = "refclock_parse.c,v 4.64 2005/11/09 20:44:47 kardel RELEASE_20051109_A";
# 
# /**===========================================================================
#  ** external interface to ntp mechanism
#@@ -2041,6 +2041,8 @@
# 					{
# 						if (pps_info.assert_sequence + pps_info.clear_sequence != parse->ppsserial)
# 						{
#+							double dtemp;
#+
# 						        struct timespec pts;
# 							/*
# 							 * add PPS time stamp if available via ppsclock module
#@@ -2050,14 +2052,19 @@
# 							  pts = pps_info.clear_timestamp;
# 							else
# 							  pts = pps_info.assert_timestamp;
#+
# 							parse->parseio.parse_dtime.parse_ptime.fp.l_ui = pts.tv_sec + JAN_1970;
#-							/* XXX round down to usec - really ? */
#-							pts.tv_nsec = (pts.tv_nsec + 500) / 1000;
#-							if (pts.tv_nsec > 1000000) {
#-							  pts.tv_nsec -= 1000000;
#-							  pts.tv_sec++;
#+
#+							dtemp = pts.tv_nsec / 1e9;
#+							if (dtemp < 0.) {
#+								dtemp += 1;
#+								parse->parseio.parse_dtime.parse_ptime.fp.l_ui--;
# 							}
#-							TVUTOTSF(pts.tv_nsec, parse->parseio.parse_dtime.parse_ptime.fp.l_uf);
#+							if (dtemp > 1.) {
#+								dtemp -= 1;
#+								parse->parseio.parse_dtime.parse_ptime.fp.l_ui++;
#+							}
#+							parse->parseio.parse_dtime.parse_ptime.fp.l_uf = dtemp * FRAC;
# 
# 						        parse->parseio.parse_dtime.parse_state |= PARSEB_PPS|PARSEB_S_PPS;
# #ifdef DEBUG
#@@ -2695,15 +2702,15 @@
# 		CLK_UNIT(parse->peer), cp);
# 
# 	if (!(mode & cap)) {
#-	  msyslog(LOG_ERR, "PARSE receiver #%d: FAILED to initialize PPS to %s",
#-		  CLK_UNIT(parse->peer), cp);
#+	  msyslog(LOG_ERR, "PARSE receiver #%d: FAILED to initialize PPS to %s (PPS API capabilities=0x%x)",
#+		  CLK_UNIT(parse->peer), cp, cap);
# 	
# 		return 0;
# 	}
# 
# 	if (!(mode1 & cap)) {
#-	  msyslog(LOG_WARNING, "PARSE receiver #%d: Cannot set PPS_%sCLEAR, this will increase jitter",
#-		  CLK_UNIT(parse->peer), cp);
#+	  msyslog(LOG_WARNING, "PARSE receiver #%d: Cannot set PPS_%sCLEAR, this will increase jitter (PPS API capabilities=0x%x)",
#+		  CLK_UNIT(parse->peer), cp, cap);
# 		mode1 = 0;
# 	} else {
# 	        if (mode1 == PPS_OFFSETCLEAR) 
#@@ -5665,6 +5672,9 @@
#  * History:
#  *
#  * refclock_parse.c,v
#+ * Revision 4.64  2005/11/09 20:44:47  kardel
#+ * utilize full PPS timestamp resolution from PPS API
#+ *
#  * Revision 4.63  2005/10/07 22:10:25  kardel
#  * bounded buffer implementation
#  *
#

# Diff checksum=79d86a48


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at deacon.udel.edu|ChangeSet|20051109053254|20554
D 1.1435.1.1 05/11/09 22:13:13+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c refclock_parse.c:
c   utilize full PPS timestamp resolution from PPS API
K 20559
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663 kardel at pogo.udel.edu|ntpd/refclock_parse.c|20051109210026|18410

mayer at pogo.udel.edu|ChangeSet|20051109204956|20340
D 1.1437 05/11/10 03:53:35-05:00 stenn at pogo.udel.edu +0 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c Merge bk://www.ntp.org/home/bk/ntp-dev
c into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev
i kardel at pogo.udel.edu|ChangeSet|20051109221313|20559
K 20345
M kardel at pogo.udel.edu|ChangeSet|20051109221313|20559
P ChangeSet
------------------------------------------------


== ntpd/refclock_parse.c ==
stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663
kardel at pogo.udel.edu|ntpd/refclock_parse.c|20051007230344|00061
D 1.37 05/11/09 21:00:26+00:00 kardel at pogo.udel.edu +23 -13
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c utilize full PPS timestamp resolution from PPS API
K 18410
O -rw-rw-r--
P ntpd/refclock_parse.c
------------------------------------------------

D2 1
I2 1
 * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.64 2005/11/09 20:44:47 kardel RELEASE_20051109_A
D4 1
I4 1
 * refclock_parse.c,v 4.64 2005/11/09 20:44:47 kardel RELEASE_20051109_A
D184 1
I184 1
static char rcsid[] = "refclock_parse.c,v 4.64 2005/11/09 20:44:47 kardel RELEASE_20051109_A";
I2043 2
							double dtemp;
\
I2052 1
\
D2054 5
I2058 5
\
							dtemp = pts.tv_nsec / 1e9;
							if (dtemp < 0.) {
								dtemp += 1;
								parse->parseio.parse_dtime.parse_ptime.fp.l_ui--;
D2060 1
I2060 5
							if (dtemp > 1.) {
								dtemp -= 1;
								parse->parseio.parse_dtime.parse_ptime.fp.l_ui++;
							}
							parse->parseio.parse_dtime.parse_ptime.fp.l_uf = dtemp * FRAC;
D2698 2
I2699 2
	  msyslog(LOG_ERR, "PARSE receiver #%d: FAILED to initialize PPS to %s (PPS API capabilities=0x%x)",
		  CLK_UNIT(parse->peer), cp, cap);
D2705 2
I2706 2
	  msyslog(LOG_WARNING, "PARSE receiver #%d: Cannot set PPS_%sCLEAR, this will increase jitter (PPS API capabilities=0x%x)",
		  CLK_UNIT(parse->peer), cp, cap);
I5667 3
 * Revision 4.64  2005/11/09 20:44:47  kardel
 * utilize full PPS timestamp resolution from PPS API
 *

# Patch checksum=4a6dfb78


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