BSD 4_3_Net_2 release

[unix-history] / usr / src / sys / sys / trace.h

diff --git a/usr/src/sys/sys/trace.h b/usr/src/sys/sys/trace.h
index 044496d..573d3fb 100644 (file)
--- a/usr/src/sys/sys/trace.h
+++ b/usr/src/sys/sys/trace.h
@@ -1,9 +1,36 @@
-/*
- * Copyright (c) 1982, 1986 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1982, 1986 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the University of
+ *     California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.

  *
  *

- *     @(#)trace.h     7.2 (Berkeley) 3/6/90
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *     @(#)trace.h     7.6 (Berkeley) 5/5/91

  */
 
 /*
  */
 
 /*


@@ -71,6 +98,7 @@
 #define        VTR_UALARM      3               /* set alarm to go off (sig 16) */
                                        /* in specified number of hz */
 #define        VTR_STAMP       4               /* user specified stamp */
 #define        VTR_UALARM      3               /* set alarm to go off (sig 16) */
                                        /* in specified number of hz */
 #define        VTR_STAMP       4               /* user specified stamp */

+

 #ifdef KERNEL
 #ifdef TRACE
 char   traceflags[TR_NFLAGS];
 #ifdef KERNEL
 #ifdef TRACE
 char   traceflags[TR_NFLAGS];


@@ -78,9 +106,9 @@ struct       proc *traceproc;
 int    tracebuf[TRCSIZ];
 unsigned tracex;
 int    tracewhich;
 int    tracebuf[TRCSIZ];
 unsigned tracex;
 int    tracewhich;

-#define        pack(v,b)       (((v)->v_mount->m_stat.f_fsid[0])<<16)|(b)
+#define        pack(v,b)       (((v)->v_mount->mnt_stat.f_fsid.val[0])<<16)|(b)

 #define        trace(a,b,c)    if (traceflags[a]) trace1(a,b,c)
 #else
 #define        trace(a,b,c)    if (traceflags[a]) trace1(a,b,c)
 #else

-#define        trace(a,b,b)    ;
+#define        trace(a,b,c)    ;

 #endif
 #endif
 #endif
 #endif