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

Harlan Stenn stenn at whimsy.udel.edu
Fri May 26 22:17:06 UTC 2006


This BitKeeper patch contains the following changesets:
kardel at pogo.udel.edu|ChangeSet|20060526144003|58686

# 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:	/deacon/backroom/ntp-dev

#
#--- 1.45/ntpd/refclock_parse.c	2006-05-26 02:15:37 -04:00
#+++ 1.46/ntpd/refclock_parse.c	2006-05-26 10:38:20 -04:00
#@@ -1,7 +1,7 @@
# /*
#- * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C
#+ * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A
#  *
#- * refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C
#+ * refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A
#  *
#  * generic reference clock driver for several DCF/GPS/MSF/... receivers
#  *
#@@ -182,7 +182,7 @@
# #include "ieee754io.h"
# #include "recvbuff.h"
# 
#-static char rcsid[] = "refclock_parse.c,v 4.70 2006/05/25 18:20:50 kardel RELEASE_20060525_C";
#+static char rcsid[] = "refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A";
# 
# /**===========================================================================
#  ** external interface to ntp mechanism
#@@ -2776,7 +2776,7 @@
# 	if (!notice)
#         {
# 		NLOG(NLOG_CLOCKINFO) /* conditional if clause for conditional syslog */
#-			msyslog(LOG_INFO, "NTP PARSE support: Copyright (c) 1989-2005, Frank Kardel");
#+			msyslog(LOG_INFO, "NTP PARSE support: Copyright (c) 1989-2006, Frank Kardel");
# 		notice = 1;
# 	}
# 
#@@ -3012,17 +3012,6 @@
# 	parse->generic->io.io_input   = parse->binding->bd_io_input; /* pick correct input routine */
# 
# 	/*
#-	 * Insert in async io device list.
#-	 */
#-	if (!io_addclock(&parse->generic->io))
#-        {
#-		msyslog(LOG_ERR,
#-			"PARSE receiver #%d: parse_start: addclock %s fails (ABORT - clock type requires async io)", CLK_UNIT(parse->peer), parsedev);
#-		parse_shutdown(CLK_UNIT(parse->peer), peer); /* let our cleaning staff do the work */
#-		return 0;
#-	}
#-
#-	/*
# 	 * as we always(?) get 8 bit chars we want to be
# 	 * sure, that the upper bits are zero for less
# 	 * than 8 bit I/O - so we pass that information on.
#@@ -3072,11 +3061,8 @@
# #ifdef HAVE_TERMIOS
# 	(void) tcflush(parse->generic->io.fd, TCIOFLUSH);
# #else
#-#ifdef TCFLSH
#+#if defined(TCFLSH) && defined(TCIOFLUSH)
# 	{
#-#ifndef TCIOFLUSH
#-#define TCIOFLUSH 2
#-#endif
# 		int flshcmd = TCIOFLUSH;
# 
# 		(void) ioctl(parse->generic->io.fd, TCFLSH, (caddr_t)&flshcmd);
#@@ -3097,6 +3083,17 @@
# 		}
# 	
# 	/*
#+	 * Insert in async io device list.
#+	 */
#+	if (!io_addclock(&parse->generic->io))
#+        {
#+		msyslog(LOG_ERR,
#+			"PARSE receiver #%d: parse_start: addclock %s fails (ABORT - clock type requires async io)", CLK_UNIT(parse->peer), parsedev);
#+		parse_shutdown(CLK_UNIT(parse->peer), peer); /* let our cleaning staff do the work */
#+		return 0;
#+	}
#+
#+	/*
# 	 * print out configuration
# 	 */
# 	NLOG(NLOG_CLOCKINFO)
#@@ -5681,6 +5678,15 @@
#  * History:
#  *
#  * refclock_parse.c,v
#+ * Revision 4.73  2006/05/26 14:23:46  kardel
#+ * cleanup of copyright info
#+ *
#+ * Revision 4.72  2006/05/26 14:19:43  kardel
#+ * cleanup of ioctl cruft
#+ *
#+ * Revision 4.71  2006/05/26 14:15:57  kardel
#+ * delay adding refclock to async refclock io after all initializations
#+ *
#  * Revision 4.70  2006/05/25 18:20:50  kardel
#  * bug #619
#  * terminate parse io engine after de-registering
#

# Diff checksum=9f47922b


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
stenn at whimsy.udel.edu|ChangeSet|20060526110246|58614
D 1.1527 06/05/26 14:40:03+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   bug 619
c   delay io_addclock() even further as suggested by Ronan Flood
K 58686
P ChangeSet
------------------------------------------------

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

== ntpd/refclock_parse.c ==
stenn at whimsy.udel.edu|ntpd/refclock_parse.c|19990526004818|01635|3aed0663
stenn at pogo.udel.edu|ntpd/refclock_parse.c|20060526061537|37375
D 1.46 06/05/26 14:38:20+00:00 kardel at pogo.udel.edu +25 -19
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c bug 619
c delay io_addclock() even further as suggested by Ronan Flood
K 56609
O -rw-rw-r--
P ntpd/refclock_parse.c
------------------------------------------------

D2 1
I2 1
 * /src/NTP/REPOSITORY/ntp4-dev/ntpd/refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A
D4 1
I4 1
 * refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A
D185 1
I185 1
static char rcsid[] = "refclock_parse.c,v 4.73 2006/05/26 14:23:46 kardel RELEASE_20060526_A";
D2779 1
I2779 1
			msyslog(LOG_INFO, "NTP PARSE support: Copyright (c) 1989-2006, Frank Kardel");
D3015 11
D3075 1
I3075 1
#if defined(TCFLSH) && defined(TCIOFLUSH)
D3077 3
I3099 11
	 * Insert in async io device list.
	 */
	if (!io_addclock(&parse->generic->io))
        {
		msyslog(LOG_ERR,
			"PARSE receiver #%d: parse_start: addclock %s fails (ABORT - clock type requires async io)", CLK_UNIT(parse->peer), parsedev);
		parse_shutdown(CLK_UNIT(parse->peer), peer); /* let our cleaning staff do the work */
		return 0;
	}
\
	/*
I5683 9
 * Revision 4.73  2006/05/26 14:23:46  kardel
 * cleanup of copyright info
 *
 * Revision 4.72  2006/05/26 14:19:43  kardel
 * cleanup of ioctl cruft
 *
 * Revision 4.71  2006/05/26 14:15:57  kardel
 * delay adding refclock to async refclock io after all initializations
 *

# Patch checksum=d7b6856e


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