diff options
| author | des <des@FreeBSD.org> | 2003-09-22 16:05:11 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2003-09-22 16:05:11 +0000 |
| commit | 1dcdf9246cc56b8eed24eeb0bd6947091de0acd7 (patch) | |
| tree | 6fdd189296715b635b9c2e3bf30111923765c248 /sys/compat/linprocfs | |
| parent | 111a6744cd1c776812920821ae50b538e92134ae (diff) | |
| download | FreeBSD-src-1dcdf9246cc56b8eed24eeb0bd6947091de0acd7.zip FreeBSD-src-1dcdf9246cc56b8eed24eeb0bd6947091de0acd7.tar.gz | |
Previous commit contained too-smart-for-its-own-good code that might
produce incorrect (though harmless) output on single-CPU systems.
Diffstat (limited to 'sys/compat/linprocfs')
| -rw-r--r-- | sys/compat/linprocfs/linprocfs.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 9e11927..ea6a0a3 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -419,18 +419,19 @@ linprocfs_dostat(PFS_FILL_ARGS) name[0] = CTL_HW; name[1] = HW_NCPU; if (kernel_sysctl(td, name, 2, &ncpu, &olen, NULL, 0, &plen) != 0) - ncpu = 0; + ncpu = 1; sbuf_printf(sb, "cpu %ld %ld %ld %ld\n", T2J(cp_time[CP_USER]), T2J(cp_time[CP_NICE]), T2J(cp_time[CP_SYS] /*+ cp_time[CP_INTR]*/), T2J(cp_time[CP_IDLE])); - for (i = 0; i < ncpu; ++i) - sbuf_printf(sb, "cpu%d %ld %ld %ld %ld\n", i, - T2J(cp_time[CP_USER]) / ncpu, - T2J(cp_time[CP_NICE]) / ncpu, - T2J(cp_time[CP_SYS]) / ncpu, - T2J(cp_time[CP_IDLE]) / ncpu); + if (ncpu > 1) + for (i = 0; i < ncpu; ++i) + sbuf_printf(sb, "cpu%d %ld %ld %ld %ld\n", i, + T2J(cp_time[CP_USER]) / ncpu, + T2J(cp_time[CP_NICE]) / ncpu, + T2J(cp_time[CP_SYS]) / ncpu, + T2J(cp_time[CP_IDLE]) / ncpu); sbuf_printf(sb, "disk 0 0 0 0\n" "page %u %u\n" @@ -568,7 +569,7 @@ linprocfs_doprocstatm(PFS_FILL_ARGS) { struct kinfo_proc kp; segsz_t lsize; - + PROC_LOCK(p); fill_kinfo_proc(p, &kp); PROC_UNLOCK(p); |
