From owner-svn-src-projects@FreeBSD.ORG Fri Jan 17 11:23:25 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 942EFA2A; Fri, 17 Jan 2014 11:23:25 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 64C6318AC; Fri, 17 Jan 2014 11:23:25 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0HBNPdd041834; Fri, 17 Jan 2014 11:23:25 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0HBNPop041831; Fri, 17 Jan 2014 11:23:25 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201401171123.s0HBNPop041831@svn.freebsd.org> From: Gleb Smirnoff Date: Fri, 17 Jan 2014 11:23:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r260824 - 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.17 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: Fri, 17 Jan 2014 11:23:25 -0000 Author: glebius Date: Fri Jan 17 11:23:24 2014 New Revision: 260824 URL: http://svnweb.freebsd.org/changeset/base/260824 Log: sbready() function tells that 'count' mbufs starting from the 'm' in the buffer 'sb' are now ready. Function returns 0 if 'm' was the first one, and now socket has data to send, otherwise EWOULDBLOCK. Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_sockbuf.c projects/sendfile/sys/sys/sockbuf.h Modified: projects/sendfile/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_sockbuf.c Fri Jan 17 11:20:23 2014 (r260823) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Fri Jan 17 11:23:24 2014 (r260824) @@ -84,6 +84,44 @@ sb_shift_nrdy(struct sockbuf *sb, struct sb->sb_fnrdy = m; } +int +sbready(struct sockbuf *sb, struct mbuf *m, int count) +{ + u_int blocker; + + SOCKBUF_LOCK(sb); + + KASSERT(sb->sb_fnrdy != NULL, ("%s: sb %p NULL fnrdy", __func__, sb)); + + blocker = (sb->sb_fnrdy == m) ? M_BLOCKED : 0; + + for (int i = 0; i < count; i++, m = m->m_next) { + KASSERT(m->m_flags & M_NOTREADY, + ("%s: m %p !M_NOTREADY", __func__, m)); + m->m_flags &= ~(M_NOTREADY | blocker); + sb->sb_acc += m->m_len; + } + + if (!blocker) { + SOCKBUF_UNLOCK(sb); + return (EWOULDBLOCK); + } + + /* This one was blocking all the queue. */ + for (; m && (m->m_flags & M_NOTREADY) == 0; m = m->m_next) { + KASSERT(m->m_flags & M_BLOCKED, + ("%s: m %p !M_BLOCKED", __func__, m)); + m->m_flags &= ~M_BLOCKED; + sb->sb_acc += m->m_len; + } + + sb->sb_fnrdy = m; + + SOCKBUF_UNLOCK(sb); + + return (0); +} + /* * Adjust sockbuf state reflecting allocation of m. */ Modified: projects/sendfile/sys/sys/sockbuf.h ============================================================================== --- projects/sendfile/sys/sys/sockbuf.h Fri Jan 17 11:20:23 2014 (r260823) +++ projects/sendfile/sys/sys/sockbuf.h Fri Jan 17 11:23:24 2014 (r260824) @@ -173,6 +173,7 @@ void sbunlock(struct sockbuf *sb); void sballoc(struct sockbuf *, struct mbuf *); void sbfree(struct sockbuf *, struct mbuf *); void sbmtrim(struct sockbuf *, struct mbuf *, int); +int sbready(struct sockbuf *, struct mbuf *, int); static inline u_int sbavail(struct sockbuf *sb)