From owner-cvs-all@FreeBSD.ORG  Sat Mar  1 15:40:53 2008
Return-Path: <owner-cvs-all@FreeBSD.ORG>
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B566B1065674;
	Sat,  1 Mar 2008 15:40:53 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id A73028FC16;
	Sat,  1 Mar 2008 15:40:53 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m21FerDA041815;
	Sat, 1 Mar 2008 15:40:53 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m21FerSv041814;
	Sat, 1 Mar 2008 15:40:53 GMT (envelope-from rwatson)
Message-Id: <200803011540.m21FerSv041814@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 1 Mar 2008 15:40:53 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: RELENG_7
Cc: 
Subject: cvs commit: src/sys/kern uipc_sockbuf.c uipc_socket.c src/sys/sys
 socketvar.h
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 01 Mar 2008 15:40:53 -0000

rwatson     2008-03-01 15:40:53 UTC

  FreeBSD src repository

  Modified files:        (Branch: RELENG_7)
    sys/kern             uipc_sockbuf.c uipc_socket.c 
    sys/sys              socketvar.h 
  Log:
  Merge uipc_sockbuf.c:1.176, uipc_socket.c:1.305, socketvar.h:1.162 from
  HEAD to RELENG_7:
  
    Further clean up sorflush:
  
    - Expose sbrelease_internal(), a variant of sbrelease() with no
      expectations about the validity of locks in the socket buffer.
    - Use sbrelease_internel() in sorflush(), and as a result avoid
      initializing and destroying a socket buffer lock for the temporary
      stack copy of the actual buffer, asb.
    - Add a comment indicating why we do what we do, and remove an XXX
      since things have gotten less ugly in sorflush() lately.
  
    This makes socket close cleaner, and possibly also marginally faster.
  
  Revision   Changes    Path
  1.171.2.3  +1 -2      src/sys/kern/uipc_sockbuf.c
  1.302.2.2  +12 -12    src/sys/kern/uipc_socket.c
  1.158.2.2  +1 -0      src/sys/sys/socketvar.h