[src/trunk]: src/sys deactivate MBUFTRACE related KASSERT()s in the !MBUFTRAC...

[drochner <drochner%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/483b02dd03f8
branches:  trunk
changeset: 543484:483b02dd03f8
user:      drochner <drochner%NetBSD.org@localhost>
date:      Wed Feb 26 14:36:43 2003 +0000

description:
deactivate MBUFTRACE related KASSERT()s in the !MBUFTRACE case

diffstat:

 sys/kern/uipc_syscalls.c |  14 +++++++-------
 sys/sys/mbuf.h           |   4 +++-
 2 files changed, 10 insertions(+), 8 deletions(-)

diffs (88 lines):

diff -r cb0fb4046000 -r 483b02dd03f8 sys/kern/uipc_syscalls.c
--- a/sys/kern/uipc_syscalls.c  Wed Feb 26 14:25:20 2003 +0000
+++ b/sys/kern/uipc_syscalls.c  Wed Feb 26 14:36:43 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: uipc_syscalls.c,v 1.76 2003/02/26 06:31:11 matt Exp $  */
+/*     $NetBSD: uipc_syscalls.c,v 1.77 2003/02/26 14:36:43 drochner Exp $      */
 
 /*
  * Copyright (c) 1982, 1986, 1989, 1990, 1993
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.76 2003/02/26 06:31:11 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uipc_syscalls.c,v 1.77 2003/02/26 14:36:43 drochner Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_pipe.h"
@@ -100,7 +100,7 @@
                fdremove(fdp, fd);
                ffree(fp);
        } else {
-               KASSERT(so->so_rcv.sb_mowner);
+               MBUFTRACE_ASSERT(so->so_rcv.sb_mowner);
                fp->f_data = (caddr_t)so;
                FILE_SET_MATURE(fp);
                FILE_UNUSE(fp, p);
@@ -320,7 +320,7 @@
        if (error == ERESTART)
                error = EINTR;
  out:
-       KASSERT(so->so_rcv.sb_mowner);
+       MBUFTRACE_ASSERT(so->so_rcv.sb_mowner);
        FILE_UNUSE(fp, p);
        return (error);
 }
@@ -559,7 +559,7 @@
        if (to)
                m_freem(to);
  out:
-       KASSERT(so->so_rcv.sb_mowner);
+       MBUFTRACE_ASSERT(so->so_rcv.sb_mowner);
        FILE_UNUSE(fp, p);
        return (error);
 }
@@ -774,7 +774,7 @@
        if (control)
                m_freem(control);
  out1:
-       KASSERT(so->so_rcv.sb_mowner);
+       MBUFTRACE_ASSERT(so->so_rcv.sb_mowner);
        FILE_UNUSE(fp, p);
        return (error);
 }
@@ -843,7 +843,7 @@
        }
        error = sosetopt(so, SCARG(uap, level), SCARG(uap, name), m);
  out:
-       KASSERT(so->so_rcv.sb_mowner);
+       MBUFTRACE_ASSERT(so->so_rcv.sb_mowner);
        FILE_UNUSE(fp, p);
        return (error);
 }
diff -r cb0fb4046000 -r 483b02dd03f8 sys/sys/mbuf.h
--- a/sys/sys/mbuf.h    Wed Feb 26 14:25:20 2003 +0000
+++ b/sys/sys/mbuf.h    Wed Feb 26 14:36:43 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mbuf.h,v 1.75 2003/02/26 07:49:02 matt Exp $   */
+/*     $NetBSD: mbuf.h,v 1.76 2003/02/26 14:36:44 drochner Exp $       */
 
 /*-
  * Copyright (c) 1996, 1997, 1999, 2001 The NetBSD Foundation, Inc.
@@ -313,6 +313,7 @@
 
 #define        MOWNER_ATTACH(mo)       LIST_INSERT_HEAD(&mowners, (mo), mo_link)
 #define        MOWNER_DETACH(mo)       LIST_REMOVE((mo), mo_link)
+#define MBUFTRACE_ASSERT(cond) KASSERT(cond)
 #else
 #define _MOWNERINIT(m, type)           do { } while (/* CONSTCOND */ 0)
 #define        _MOWNERREF(m, flags)            do { } while (/* CONSTCOND */ 0)
@@ -323,6 +324,7 @@
 #define        MOWNER_ATTACH(mo)               do { } while (/* CONSTCOND */ 0)
 #define        MOWNER_DETACH(mo)               do { } while (/* CONSTCOND */ 0)
 #define        m_claim(m, mo)                  do { } while (/* CONSTCOND */ 0)
+#define MBUFTRACE_ASSERT(cond)         do { } while (/* CONSTCOND */ 0)
 #endif