Date: Sat, 10 Jul 2004 04:04:44 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 56940 for review Message-ID: <200407100404.i6A44iZh011580@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=56940 Change 56940 by rwatson@rwatson_tislabs on 2004/07/10 04:04:30 Integrate netperf_socket from CVS; loop back addition of selected socket buffer assertions in soreceive(). Affected files ... .. //depot/projects/netperf_socket/sys/dev/fb/creator.c#3 integrate .. //depot/projects/netperf_socket/sys/kern/uipc_socket.c#28 integrate .. //depot/projects/netperf_socket/sys/sparc64/creator/creator_upa.c#5 integrate .. //depot/projects/netperf_socket/sys/sys/param.h#17 integrate Differences ... ==== //depot/projects/netperf_socket/sys/dev/fb/creator.c#3 (text+ko) ==== @@ -23,20 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/fb/creator.c,v 1.4 2004/04/04 12:52:22 tmm Exp $ + * $FreeBSD: src/sys/dev/fb/creator.c,v 1.5 2004/07/09 23:12:22 marius Exp $ */ #include <sys/param.h> #include <sys/systm.h> #include <sys/bus.h> -#include <sys/kernel.h> -#include <sys/conf.h> -#include <sys/cons.h> -#include <sys/proc.h> -#include <sys/fcntl.h> -#include <sys/malloc.h> #include <sys/fbio.h> #include <sys/consio.h> +#include <sys/kernel.h> +#include <sys/module.h> #include <machine/bus.h> #include <machine/ofw_upa.h> ==== //depot/projects/netperf_socket/sys/kern/uipc_socket.c#28 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.192 2004/07/05 19:29:33 rwatson Exp $"); +__FBSDID("$FreeBSD: src/sys/kern/uipc_socket.c,v 1.193 2004/07/10 03:47:15 rwatson Exp $"); #include "opt_inet.h" #include "opt_mac.h" @@ -951,6 +951,7 @@ so->so_error = 0; goto release; } + SOCKBUF_LOCK_ASSERT(&so->so_rcv); if (so->so_rcv.sb_state & SBS_CANTRCVMORE) { if (m) goto dontblock; @@ -1145,6 +1146,7 @@ goto release; } else uio->uio_resid -= len; + SOCKBUF_LOCK_ASSERT(&so->so_rcv); if (len == m->m_len - moff) { if (m->m_flags & M_EOR) flags |= MSG_EOR; @@ -1188,6 +1190,7 @@ so->so_rcv.sb_cc -= len; } } + SOCKBUF_LOCK_ASSERT(&so->so_rcv); if (so->so_oobmark) { if ((flags & MSG_PEEK) == 0) { so->so_oobmark -= len; @@ -1238,6 +1241,7 @@ } } + SOCKBUF_LOCK_ASSERT(&so->so_rcv); if (m != NULL && pr->pr_flags & PR_ATOMIC) { flags |= MSG_TRUNC; if ((flags & MSG_PEEK) == 0) { @@ -1278,6 +1282,7 @@ SOCKBUF_LOCK_ASSERT(&so->so_rcv); sbunlock(&so->so_rcv); out: + SOCKBUF_LOCK_ASSERT(&so->so_rcv); SOCKBUF_UNLOCK(&so->so_rcv); return (error); } ==== //depot/projects/netperf_socket/sys/sparc64/creator/creator_upa.c#5 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sparc64/creator/creator_upa.c,v 1.5 2004/06/16 09:47:23 phk Exp $ + * $FreeBSD: src/sys/sparc64/creator/creator_upa.c,v 1.6 2004/07/09 23:12:22 marius Exp $ */ #include <sys/param.h> @@ -32,10 +32,12 @@ #include <sys/consio.h> #include <sys/conf.h> #include <sys/fbio.h> -#include <sys/interrupt.h> #include <sys/kernel.h> +#include <sys/module.h> + #include <machine/bus.h> #include <machine/resource.h> + #include <sys/rman.h> #include <dev/ofw/openfirm.h> ==== //depot/projects/netperf_socket/sys/sys/param.h#17 (text+ko) ==== @@ -32,7 +32,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.3 (Berkeley) 4/4/95 - * $FreeBSD: src/sys/sys/param.h,v 1.200 2004/07/09 16:57:24 emax Exp $ + * $FreeBSD: src/sys/sys/param.h,v 1.201 2004/07/09 21:51:14 emax Exp $ */ #ifndef _SYS_PARAM_H_
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407100404.i6A44iZh011580>