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

Harlan Stenn stenn at whimsy.udel.edu
Tue May 9 09:59:59 UTC 2006


This BitKeeper patch contains the following changesets:
kardel at pogo.udel.edu|ChangeSet|20060509094229|58417
kardel at pogo.udel.edu|ChangeSet|20060509095616|58434
kardel at pogo.udel.edu|ChangeSet|20060509093028|58420

# 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.83/ntpd/ntpd.c	2006-05-09 03:11:09 -04:00
#+++ 1.85/ntpd/ntpd.c	2006-05-09 05:55:06 -04:00
#@@ -412,7 +412,6 @@
# 	)
# {
# 	l_fp now;
#-	int tot_full_recvbufs;
# 	struct recvbuf *rbuf;
# #ifdef _AIX			/* HMS: ifdef SIGDANGER? */
# 	struct sigaction sa;
#@@ -873,9 +872,12 @@
# #if defined(HAVE_IO_COMPLETION_PORT)
# 
# 	for (;;) {
#-		tot_full_recvbufs = GetReceivedBuffers();
#+		int tot_full_recvbufs = GetReceivedBuffers();
# #else /* normal I/O */
# 
#+#if defined(HAVE_SIGNALED_IO)
#+	block_io_and_alarm();
#+# endif
# 	was_alarmed = 0;
# 	for (;;)
# 	{
#@@ -885,8 +887,6 @@
# 
# 		fd_set rdfdes;
# 		int nfound;
#-# elif defined(HAVE_SIGNALED_IO)
#-		block_io_and_alarm();
# # endif
# 
# 		if (alarm_flag) 	/* alarmed? */
#@@ -979,6 +979,7 @@
#                         block_io_and_alarm();
# # endif /* HAVE_SIGNALED_IO */
# 			freerecvbuf(rbuf);
#+			rbuf = get_full_recv_buffer();
# 		}
# 
# 		/*
#

# Diff checksum=0d02f543


# Patch vers:	1.3
# Patch type:	REGULAR

== ChangeSet ==
stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
kardel at pogo.udel.edu|ChangeSet|20060509071214|58416
D 1.1505.1.1 06/05/09 09:30:28+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntpd.c:
c   refill of current buffer missing
K 58420
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663 kardel at pogo.udel.edu|ntpd/ntpd.c|20060509092943|10161

stenn at whimsy.udel.edu|ChangeSet|20060509072447|58413
D 1.1507 06/05/09 09:42:29+00:00 kardel 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|20060509093028|58420
K 58417
M kardel at pogo.udel.edu|ChangeSet|20060509093028|58420
P ChangeSet
------------------------------------------------


kardel at pogo.udel.edu|ChangeSet|20060509094229|58417
D 1.1508 06/05/09 09:56:16+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c ntpd.c:
c   keep block/unblock calls balanced
K 58434
P ChangeSet
------------------------------------------------

0a0
> stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663 kardel at pogo.udel.edu|ntpd/ntpd.c|20060509095506|08596

== ntpd/ntpd.c ==
stenn at whimsy.udel.edu|ntpd/ntpd.c|19990526004817|01635|3aed0663
kardel at pogo.udel.edu|ntpd/ntpd.c|20060509071109|07322
D 1.84 06/05/09 09:29:43+00:00 kardel at pogo.udel.edu +1 -0
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c refill of current buffer missing
K 10161
O -rw-rw-r--
P ntpd/ntpd.c
------------------------------------------------

I981 1
			rbuf = get_full_recv_buffer();

kardel at pogo.udel.edu|ntpd/ntpd.c|20060509092943|10161
D 1.85 06/05/09 09:55:06+00:00 kardel at pogo.udel.edu +4 -4
B stenn at whimsy.udel.edu|ChangeSet|19990526004811|57482|8983e65c737bb465
C
c keep block/unblock calls balanced
K 8596
O -rw-rw-r--
P ntpd/ntpd.c
------------------------------------------------

D415 1
D876 1
I876 1
		int tot_full_recvbufs = GetReceivedBuffers();
I878 3
#if defined(HAVE_SIGNALED_IO)
	block_io_and_alarm();
# endif
D888 2

# Patch checksum=5874a0e6


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