From owner-svn-src-projects@FreeBSD.ORG Wed Nov 12 10:03:11 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DD5B4DF9; Wed, 12 Nov 2014 10:03:11 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C9F8399A; Wed, 12 Nov 2014 10:03:11 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sACA3BNk078936; Wed, 12 Nov 2014 10:03:11 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sACA3B3M078934; Wed, 12 Nov 2014 10:03:11 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201411121003.sACA3B3M078934@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Wed, 12 Nov 2014 10:03:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r274422 - in projects/sendfile/sys: kern sys X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 12 Nov 2014 10:03:12 -0000 Author: glebius Date: Wed Nov 12 10:03:10 2014 New Revision: 274422 URL: https://svnweb.freebsd.org/changeset/base/274422 Log: Sync with head @274421. Modified: projects/sendfile/sys/kern/sys_socket.c projects/sendfile/sys/sys/sockbuf.h Directory Properties: projects/sendfile/ (props changed) projects/sendfile/sys/ (props changed) Modified: projects/sendfile/sys/kern/sys_socket.c ============================================================================== --- projects/sendfile/sys/kern/sys_socket.c Wed Nov 12 09:57:15 2014 (r274421) +++ projects/sendfile/sys/kern/sys_socket.c Wed Nov 12 10:03:10 2014 (r274422) @@ -185,7 +185,11 @@ soo_ioctl(struct file *fp, u_long cmd, v case FIONSPACE: /* Unlocked read. */ - *(int *)data = sbspace(&so->so_snd); + if ((so->so_snd.sb_hiwat < sbused(&so->so_snd)) || + (so->so_snd.sb_mbmax < so->so_snd.sb_mbcnt)) + *(int *)data = 0; + else + *(int *)data = sbspace(&so->so_snd); break; case FIOSETOWN: Modified: projects/sendfile/sys/sys/sockbuf.h ============================================================================== --- projects/sendfile/sys/sys/sockbuf.h Wed Nov 12 09:57:15 2014 (r274421) +++ projects/sendfile/sys/sys/sockbuf.h Wed Nov 12 10:03:10 2014 (r274422) @@ -177,6 +177,10 @@ void sbfree(struct sockbuf *, struct mbu void sbmtrim(struct sockbuf *, struct mbuf *, int); int sbready(struct sockbuf *, struct mbuf *, int); +/* + * Return how much data is available to be taken out of socket + * buffer right now. + */ static inline u_int sbavail(struct sockbuf *sb) { @@ -187,6 +191,10 @@ sbavail(struct sockbuf *sb) return (sb->sb_acc); } +/* + * Return how much data sits there in the socket buffer + * It might be that some data is not yet ready to be read. + */ static inline u_int sbused(struct sockbuf *sb) {