From owner-svn-src-user@FreeBSD.ORG Tue Oct 13 03:55:58 2009 Return-Path: Delivered-To: svn-src-user@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 320CE106568B; Tue, 13 Oct 2009 03:55:58 +0000 (UTC) (envelope-from kmacy@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 07F458FC1B; Tue, 13 Oct 2009 03:55:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9D3tv3k094036; Tue, 13 Oct 2009 03:55:57 GMT (envelope-from kmacy@svn.freebsd.org) Received: (from kmacy@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9D3tvaF094033; Tue, 13 Oct 2009 03:55:57 GMT (envelope-from kmacy@svn.freebsd.org) Message-Id: <200910130355.n9D3tvaF094033@svn.freebsd.org> From: Kip Macy Date: Tue, 13 Oct 2009 03:55: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: r198013 - user/kmacy/releng_8_fcs/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 " user" src tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Oct 2009 03:55:58 -0000 Author: kmacy Date: Tue Oct 13 03:55:57 2009 New Revision: 198013 URL: http://svn.freebsd.org/changeset/base/198013 Log: remove residual bg sendfile socket references before destroying socket buffer Modified: user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c user/kmacy/releng_8_fcs/sys/kern/uipc_syscalls.c Modified: user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c ============================================================================== --- user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c Tue Oct 13 01:58:50 2009 (r198012) +++ user/kmacy/releng_8_fcs/sys/kern/uipc_socket.c Tue Oct 13 03:55:57 2009 (r198013) @@ -166,6 +166,7 @@ static struct filterops sowrite_filtops uma_zone_t socket_zone; so_gen_t so_gencnt; /* generation count for sockets */ +extern int bg_sendfile_enable; int maxsockets; MALLOC_DEFINE(M_SONAME, "soname", "socket name"); @@ -620,6 +621,16 @@ sofree(struct socket *so) if (pr->pr_usrreqs->pru_detach != NULL) (*pr->pr_usrreqs->pru_detach)(so); + if (bg_sendfile_enable) { + SOCKBUF_LOCK(&so->so_snd); + if ((so->so_snd.sb_flags & (SB_SENDING|SB_SENDING_TASK)) == + (SB_SENDING|SB_SENDING_TASK)) + sbwait(&so->so_snd); + else if (so->so_snd.sb_flags & SB_SENDING) + sosendingwakeup(&so->so_snd); + SOCKBUF_UNLOCK(&so->so_snd); + } + /* * From this point on, we assume that no other references to this * socket exist anywhere else in the stack. Therefore, no locks need Modified: user/kmacy/releng_8_fcs/sys/kern/uipc_syscalls.c ============================================================================== --- user/kmacy/releng_8_fcs/sys/kern/uipc_syscalls.c Tue Oct 13 01:58:50 2009 (r198012) +++ user/kmacy/releng_8_fcs/sys/kern/uipc_syscalls.c Tue Oct 13 03:55:57 2009 (r198013) @@ -116,7 +116,7 @@ SYSCTL_INT(_kern_ipc, OID_AUTO, nsfbufsu /* XXX move to header */ int getsock(struct filedesc *fdp, int fd, struct file **fpp, u_int *fflagp); -static int bg_sendfile_enable = 0; +int bg_sendfile_enable = 0; SYSCTL_INT(_kern_ipc, OID_AUTO, bg_sendfile_enable, CTLFLAG_RW, &bg_sendfile_enable, 0, "Enable background sendfile");