From owner-svn-src-projects@FreeBSD.ORG Tue Oct 7 14:34:42 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 877A0324; Tue, 7 Oct 2014 14:34:42 +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 73C7099A; Tue, 7 Oct 2014 14:34:42 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s97EYgMx022054; Tue, 7 Oct 2014 14:34:42 GMT (envelope-from glebius@FreeBSD.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s97EYgQQ022052; Tue, 7 Oct 2014 14:34:42 GMT (envelope-from glebius@FreeBSD.org) Message-Id: <201410071434.s97EYgQQ022052@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: glebius set sender to glebius@FreeBSD.org using -f From: Gleb Smirnoff Date: Tue, 7 Oct 2014 14:34:42 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r272703 - projects/sendfile/sys/kern 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: Tue, 07 Oct 2014 14:34:42 -0000 Author: glebius Date: Tue Oct 7 14:34:41 2014 New Revision: 272703 URL: https://svnweb.freebsd.org/changeset/base/272703 Log: Inline sb_shift_nrdy(). Sponsored by: Netflix Sponsored by: Nginx, Inc. Modified: projects/sendfile/sys/kern/uipc_sockbuf.c Modified: projects/sendfile/sys/kern/uipc_sockbuf.c ============================================================================== --- projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 14:30:24 2014 (r272702) +++ projects/sendfile/sys/kern/uipc_sockbuf.c Tue Oct 7 14:34:41 2014 (r272703) @@ -68,25 +68,6 @@ static u_long sb_efficiency = 8; /* para static struct mbuf *sbcut_internal(struct sockbuf *sb, int len); static void sbflush_internal(struct sockbuf *sb); -static void -sb_shift_nrdy(struct sockbuf *sb, struct mbuf *m) -{ - -#if 0 /* XXX: not yet: soclose() call path comes here w/o lock. */ - SOCKBUF_LOCK_ASSERT(sb); -#endif - KASSERT(m->m_flags & M_NOTREADY, ("%s: m %p !M_NOTREADY", __func__, m)); - - m = m->m_next; - while (m != NULL && !(m->m_flags & M_NOTREADY)) { - m->m_flags &= ~M_BLOCKED; - sb->sb_acc += m->m_len; - m = m->m_next; - } - - sb->sb_fnrdy = m; -} - int sbready(struct sockbuf *sb, struct mbuf *m, int count) { @@ -169,8 +150,18 @@ sbfree(struct sockbuf *sb, struct mbuf * if (!(m->m_flags & M_NOTAVAIL)) sb->sb_acc -= m->m_len; - if (sb->sb_fnrdy == m) - sb_shift_nrdy(sb, m); + if (m == sb->sb_fnrdy) { + KASSERT(m->m_flags & M_NOTREADY, + ("%s: m %p !M_NOTREADY", __func__, m)); + + m = m->m_next; + while (m != NULL && !(m->m_flags & M_NOTREADY)) { + m->m_flags &= ~M_BLOCKED; + sb->sb_acc += m->m_len; + m = m->m_next; + } + sb->sb_fnrdy = m; + } if (m->m_type != MT_DATA && m->m_type != MT_OOBDATA) sb->sb_ctl -= m->m_len;