From owner-p4-projects@FreeBSD.ORG Mon Jun 21 01:20:44 2004 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id AF48A16A4D0; Mon, 21 Jun 2004 01:20:44 +0000 (GMT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7F3A816A4CE for ; Mon, 21 Jun 2004 01:20:44 +0000 (GMT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 792E243D58 for ; Mon, 21 Jun 2004 01:20:44 +0000 (GMT) (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.11/8.12.11) with ESMTP id i5L1KioK036026 for ; Mon, 21 Jun 2004 01:20:44 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.11/8.12.11/Submit) id i5L1KhkM036022 for perforce@freebsd.org; Mon, 21 Jun 2004 01:20:43 GMT (envelope-from bb+lists.freebsd.perforce@cyrus.watson.org) Date: Mon, 21 Jun 2004 01:20:43 GMT Message-Id: <200406210120.i5L1KhkM036022@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to bb+lists.freebsd.perforce@cyrus.watson.org using -f From: Robert Watson To: Perforce Change Reviews Subject: PERFORCE change 55427 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Jun 2004 01:20:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=55427 Change 55427 by rwatson@rwatson_paprika on 2004/06/21 01:20:11 A bit of whitespace diff reduction in netperf_socket to make it easier to diff versions of the netperf patches. Affected files ... .. //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#19 edit Differences ... ==== //depot/projects/netperf_socket/sys/kern/uipc_socket2.c#19 (text+ko) ==== @@ -337,6 +337,7 @@ socantsendmore_locked(so) struct socket *so; { + SOCKBUF_LOCK_ASSERT(&so->so_snd); so->so_state |= SS_CANTSENDMORE; @@ -349,6 +350,7 @@ { SOCKBUF_LOCK(&so->so_rcv); + socantrcvmore_locked(so); mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } @@ -357,6 +359,7 @@ socantrcvmore_locked(so) struct socket *so; { + SOCKBUF_LOCK_ASSERT(&so->so_rcv); so->so_state |= SS_CANTRCVMORE; @@ -370,7 +373,6 @@ sbwait(sb) struct sockbuf *sb; { - SOCKBUF_LOCK_ASSERT(sb); SOCKBUF_LOCK_ASSERT(sb);