diff options
| author | oster <oster@NetBSD.org> | 1999-01-26 02:33:49 +0000 |
|---|---|---|
| committer | oster <oster@NetBSD.org> | 1999-01-26 02:33:49 +0000 |
| commit | 1eecf8e491f4ecb40edff2d8093fac193d203e73 (patch) | |
| tree | fc9f06792e783e03fe393007c4caf9d3c8da17f3 /sys/dev/raidframe/rf_cpuutil.c | |
| parent | 7c2e6d4c420981d843ea6d87e2aa3ad916fac166 (diff) | |
RAIDframe cleanup, phase 1. Nuke simulator support, user-land driver,
out-dated comments, and other unneeded stuff. This helps prepare
for cleaning up the rest of the code, and adding new functionality.
No functional changes to the kernel code in this commit.
Diffstat (limited to 'sys/dev/raidframe/rf_cpuutil.c')
| -rw-r--r-- | sys/dev/raidframe/rf_cpuutil.c | 80 |
1 files changed, 1 insertions, 79 deletions
diff --git a/sys/dev/raidframe/rf_cpuutil.c b/sys/dev/raidframe/rf_cpuutil.c index 945da8d8143..4b368f701f2 100644 --- a/sys/dev/raidframe/rf_cpuutil.c +++ b/sys/dev/raidframe/rf_cpuutil.c @@ -1,4 +1,4 @@ -/* $NetBSD: rf_cpuutil.c,v 1.1 1998/11/13 04:20:27 oster Exp $ */ +/* $NetBSD: rf_cpuutil.c,v 1.2 1999/01/26 02:33:51 oster Exp $ */ /* * Copyright (c) 1995 Carnegie-Mellon University. * All rights reserved. @@ -31,55 +31,13 @@ * track cpu utilization */ -#ifdef _KERNEL -#define KERNEL -#endif - #include "rf_cpuutil.h" -#ifndef KERNEL -#include <errno.h> -#endif /* !KERNEL */ #include "rf_types.h" #include "rf_general.h" #include "rf_shutdown.h" #include "rf_sys.h" -#ifdef __osf__ -#include <sys/table.h> -#endif /* __osf__ */ -#ifdef AIX -#include <nlist.h> -#include <sys/sysinfo.h> -#endif /* AIX */ -#ifdef KERNEL -#ifndef __NetBSD__ -#include <sys/dk.h> -#endif /* __NetBSD__ */ -#else /* KERNEL */ -extern int table(int id, int index, void *addr, int nel, u_int lel); -#endif /* KERNEL */ - -#ifdef __osf__ -static struct tbl_sysinfo start, stop; -#endif /* __osf__ */ - -#ifdef AIX -static int kmem_fd; -static off_t sysinfo_offset; -static struct sysinfo sysinfo_start, sysinfo_stop; -static struct nlist namelist[] = { - {{"sysinfo"}}, - {{""}}, -}; -#endif /* AIX */ -#ifdef AIX -static void rf_ShutdownCpuMonitor(ignored) - void *ignored; -{ - close(kmem_fd); -} -#endif /* AIX */ int rf_ConfigureCpuMonitor(listp) RF_ShutdownList_t **listp; @@ -115,20 +73,6 @@ int rf_ConfigureCpuMonitor(listp) void rf_start_cpu_monitor() { -#ifdef __osf__ -#ifndef KERNEL - if (table(TBL_SYSINFO, 0, &start, 1, sizeof(start)) != 1) { - printf("Unable to get sysinfo for cpu utilization monitor\n"); - perror("start_cpu_monitor"); - } -#else /* !KERNEL */ - /* start.si_user = cp_time[CP_USER]; - start.si_nice = cp_time[CP_NICE]; - start.si_sys = cp_time[CP_SYS]; - start.si_idle = cp_time[CP_IDLE]; - start.wait = cp_time[CP_WAIT]; */ -#endif /* !KERNEL */ -#endif /* __osf__ */ #ifdef AIX off_t off; int rc; @@ -145,20 +89,6 @@ void rf_start_cpu_monitor() void rf_stop_cpu_monitor() { -#ifdef __osf__ -#ifndef KERNEL - if (table(TBL_SYSINFO, 0, &stop, 1, sizeof(stop)) != 1) { - printf("Unable to get sysinfo for cpu utilization monitor\n"); - perror("stop_cpu_monitor"); - } -#else /* !KERNEL */ - /* stop.si_user = cp_time[CP_USER]; - stop.si_nice = cp_time[CP_NICE]; - stop.si_sys = cp_time[CP_SYS]; - stop.si_idle = cp_time[CP_IDLE]; - stop.wait = cp_time[CP_WAIT]; */ -#endif /* !KERNEL */ -#endif /* __osf__ */ #ifdef AIX off_t off; int rc; @@ -176,14 +106,6 @@ void rf_stop_cpu_monitor() void rf_print_cpu_util(s) char *s; { -#ifdef __osf__ - long totalticks, idleticks; - - idleticks = stop.si_idle - start.si_idle + stop.wait - start.wait; - totalticks = stop.si_user - start.si_user + stop.si_nice - start.si_nice + - stop.si_sys - start.si_sys + idleticks; - printf("CPU utilization during %s was %d %%\n", s, 100 - 100*idleticks/totalticks); -#endif /* __osf__ */ #ifdef AIX long idle; |
