From owner-svn-src-user@FreeBSD.ORG  Tue Mar  6 19:46:57 2012
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id E6EA41065741;
	Tue,  6 Mar 2012 19:46:57 +0000 (UTC)
	(envelope-from andre@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D727A8FC08;
	Tue,  6 Mar 2012 19:46:57 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q26Jkv4J054763;
	Tue, 6 Mar 2012 19:46:57 GMT (envelope-from andre@svn.freebsd.org)
Received: (from andre@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q26JkvpL054761;
	Tue, 6 Mar 2012 19:46:57 GMT (envelope-from andre@svn.freebsd.org)
Message-Id: <201203061946.q26JkvpL054761@svn.freebsd.org>
From: Andre Oppermann <andre@FreeBSD.org>
Date: Tue, 6 Mar 2012 19:46:57 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r232618 - user/andre/tcp_workqueue/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2012 19:46:58 -0000

Author: andre
Date: Tue Mar  6 19:46:57 2012
New Revision: 232618
URL: http://svn.freebsd.org/changeset/base/232618

Log:
  Fix the MSG_WAITALL case by comparing against sb_hiwat.  Before
  it was looping for every receive as sb_lowat normally is zero.
  
  Add comment about issue with (MSG_WAITALL | MSG_PEEK) which isn't
  properly handled.

Modified:
  user/andre/tcp_workqueue/sys/kern/uipc_socket.c

Modified: user/andre/tcp_workqueue/sys/kern/uipc_socket.c
==============================================================================
--- user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Tue Mar  6 19:43:26 2012	(r232617)
+++ user/andre/tcp_workqueue/sys/kern/uipc_socket.c	Tue Mar  6 19:46:57 2012	(r232618)
@@ -1930,6 +1930,7 @@ release:
 
 /*
  * Optimized version of soreceive() for stream (TCP) sockets.
+ * XXXAO: (MSG_WAITALL | MSG_PEEK) isn't properly handled.
  */
 int
 soreceive_stream(struct socket *so, struct sockaddr **psa, struct uio *uio,
@@ -2018,7 +2019,7 @@ restart:
 
 	/* On MSG_WAITALL we must wait until all data or error arrives. */
 	if ((flags & MSG_WAITALL) &&
-	    (sb->sb_cc >= uio->uio_resid || sb->sb_cc >= sb->sb_lowat))
+	    (sb->sb_cc >= uio->uio_resid || sb->sb_cc >= sb->sb_hiwat))
 		goto deliver;
 
 	/*