nuke prehistoric disk statistics

3 files changed, 3 insertions, 42 deletions

diff --git a/sys/kern/kern_clock.c b/sys/kern/kern_clock.c
index 45ea1f52e6e..53180a009b3 100644
--- a/sys/kern/kern_clock.c
+++ b/sys/kern/kern_clock.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kern_clock.c,v 1.15 1997/01/25 23:35:58 tholo Exp $	*/
+/*	$OpenBSD: kern_clock.c,v 1.16 1997/11/23 03:19:17 mickey Exp $	*/
 /*	$NetBSD: kern_clock.c,v 1.34 1996/06/09 04:51:03 briggs Exp $	*/
 
 /*-
@@ -901,7 +901,6 @@ statclock(frame)
 	register struct gmonparam *g;
 #endif
 	register struct proc *p;
-	register int i;
 
 	if (CLKF_USERMODE(frame)) {
 		p = curproc;
@@ -960,20 +959,6 @@ statclock(frame)
 	pscnt = psdiv;
 
 	/*
-	 * XXX Support old-style instrumentation for now.
-	 *
-	 * We maintain statistics shown by user-level statistics
-	 * programs:  the amount of time in each cpu state, and
-	 * the amount of time each of DK_NDRIVE ``drives'' is busy.
-	 *
-	 * XXX	should either run linked list of drives, or (better)
-	 *	grab timestamps in the start & done code.
-	 */
-	for (i = 0; i < DK_NDRIVE; i++)
-		if (dk_busy & (1 << i))
-			dk_time[i]++;
-
-	/*
 	 * We adjust the priority of the current process.  The priority of
 	 * a process gets worse as it accumulates CPU time.  The cpu usage
 	 * estimator (p_estcpu) is increased here.  The formula for computing
diff --git a/sys/kern/subr_disk.c b/sys/kern/subr_disk.c
index 3768d766b36..bcae3380548 100644
--- a/sys/kern/subr_disk.c
+++ b/sys/kern/subr_disk.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: subr_disk.c,v 1.15 1997/08/07 09:27:01 niklas Exp $	*/
+/*	$OpenBSD: subr_disk.c,v 1.16 1997/11/23 03:19:18 mickey Exp $	*/
 /*	$NetBSD: subr_disk.c,v 1.17 1996/03/16 23:17:08 christos Exp $	*/
 
 /*
@@ -67,19 +67,6 @@ struct	disklist_head disklist;	/* TAILQ_HEAD */
 int	disk_count;		/* number of drives in global disklist */
 
 /*
- * Old-style disk instrumentation structures.  These will go away
- * someday.
- */
-long	dk_seek[DK_NDRIVE];
-long	dk_time[DK_NDRIVE];
-long	dk_wds[DK_NDRIVE];
-long	dk_wpms[DK_NDRIVE];
-long	dk_xfer[DK_NDRIVE];
-int	dk_busy;
-int	dk_ndrive;
-int	dkn;			/* number of slots filled so far */
-
-/*
  * Seek sort for disks.  We depend on the driver which calls us using b_resid
  * as the current cylinder number.
  *
@@ -256,7 +243,6 @@ disk_init()
 
 	TAILQ_INIT(&disklist);
 	disk_count = 0;
-	dk_ndrive = DK_NDRIVE;		/* XXX */
 }
 
 /*
diff --git a/sys/sys/dkstat.h b/sys/sys/dkstat.h
index 8d134e5c3cf..b236238d9a9 100644
--- a/sys/sys/dkstat.h
+++ b/sys/sys/dkstat.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dkstat.h,v 1.3 1996/03/03 12:11:36 niklas Exp $	*/
+/*	$OpenBSD: dkstat.h,v 1.4 1997/11/23 03:19:20 mickey Exp $	*/
 /*	$NetBSD: dkstat.h,v 1.8 1995/12/28 19:16:31 thorpej Exp $	*/
 
 /*-
@@ -52,16 +52,6 @@
 #ifdef _KERNEL
 long cp_time[CPUSTATES];
 
-extern long dk_seek[];
-extern long dk_time[];
-extern long dk_wds[];
-extern long dk_wpms[];
-extern long dk_xfer[];
-
-extern int dk_busy;
-extern int dk_ndrive;
-extern int dkn;
-
 long tk_cancc;
 long tk_nin;
 long tk_nout;