BSD 4_4 release

[unix-history] / usr / src / sys / netiso / tp_meas.c

diff --git a/usr/src/sys/netiso/tp_meas.c b/usr/src/sys/netiso/tp_meas.c
index c05f53c..f8bbbe6 100644 (file)
--- a/usr/src/sys/netiso/tp_meas.c
+++ b/usr/src/sys/netiso/tp_meas.c
@@ -1,3 +1,38 @@
+/*-
+ * Copyright (c) 1991, 1993
+ *     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.
+ *
+ * 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.
+ *
+ *     @(#)tp_meas.c   8.1 (Berkeley) 6/10/93
+ */
+

 /***********************************************************
                Copyright IBM Corporation 1987
 
 /***********************************************************
                Copyright IBM Corporation 1987
 


@@ -27,20 +62,16 @@ SOFTWARE.
 /*
  * $Header: tp_meas.c,v 5.2 88/11/18 17:28:04 nhall Exp $
  * $Source: /usr/argo/sys/netiso/RCS/tp_meas.c,v $
 /*
  * $Header: tp_meas.c,v 5.2 88/11/18 17:28:04 nhall Exp $
  * $Source: /usr/argo/sys/netiso/RCS/tp_meas.c,v $

- *     @(#)tp_meas.c   7.3 (Berkeley) 8/29/89 *

  * 
  * tp_meas.c : create a performance measurement event
  * in the circular buffer tp_Meas[]
  */
 
  * 
  * tp_meas.c : create a performance measurement event
  * in the circular buffer tp_Meas[]
  */
 

-#ifndef lint
-static char *rcsid = "$Header: tp_meas.c,v 5.2 88/11/18 17:28:04 nhall Exp $";
-#endif lint
+#include <sys/types.h>
+#include <sys/time.h>

 
 

-#include "types.h"
-#include "time.h"
-#include "argo_debug.h"
-#include "tp_meas.h"
+#include <netiso/argo_debug.h>
+#include <netiso/tp_meas.h>

 
 extern struct timeval time;
 
 
 extern struct timeval time;
 


@@ -93,4 +124,4 @@ Tpmeas(ref, kind, timev, seq, win, size)
        tpm->tpm_size = size;
 }
 
        tpm->tpm_size = size;
 }
 

-#endif TP_PERF_MEAS
+#endif /* TP_PERF_MEAS */