View | Details | Raw Unified | Return to bug 27522
Collapse All | Expand All

(-)linprocfs_misc.c (-5 / +25 lines)
Lines 52-57 Link Here
52
#include <sys/tty.h>
52
#include <sys/tty.h>
53
#include <sys/vnode.h>
53
#include <sys/vnode.h>
54
#include <sys/lock.h>
54
#include <sys/lock.h>
55
#include <sys/sysctl.h>
55
56
56
#include <vm/vm.h>
57
#include <vm/vm.h>
57
#include <vm/pmap.h>
58
#include <vm/pmap.h>
Lines 266-285 Link Here
266
        char *ps;
267
        char *ps;
267
	char psbuf[512];
268
	char psbuf[512];
268
	int xlen;
269
	int xlen;
270
	int ncpu, mib[2], i, olen=sizeof(ncpu), plen=0;
269
271
270
	ps = psbuf;
272
	ps = psbuf;
271
	ps += sprintf(ps,
273
	ps += sprintf(ps,
272
		      "cpu %ld %ld %ld %ld\n"
274
		      "cpu %ld %ld %ld %ld\n",
275
		      T2J(cp_time[CP_USER]),
276
		      T2J(cp_time[CP_NICE]),
277
		      T2J(cp_time[CP_SYS] /*+ cp_time[CP_INTR]*/),
278
		      T2J(cp_time[CP_IDLE]));
279
280
	mib[0] = CTL_HW; mib[1] = HW_NCPU;
281
	if (kernel_sysctl(p, mib, 2, &ncpu, &olen, NULL, 0, &plen))
282
		ncpu=1;		/* Fake out if the sysctl failed */
283
284
	if ( ncpu > 1 ) {
285
		for (i = 0; i < ncpu; i++) {
286
			ps += sprintf(ps,
287
		      	"cpu%d %ld %ld %ld %ld\n",
288
				i,
289
		      	T2J(cp_time[CP_USER]/ncpu),
290
		      	T2J(cp_time[CP_NICE]/ncpu),
291
		      	T2J(cp_time[CP_SYS]/ncpu /*+ cp_time[CP_INTR]*/),
292
		      	T2J(cp_time[CP_IDLE]/ncpu));
293
		}
294
	}
295
296
	ps+= sprintf(ps,
273
		      "disk 0 0 0 0\n"
297
		      "disk 0 0 0 0\n"
274
		      "page %u %u\n"
298
		      "page %u %u\n"
275
		      "swap %u %u\n"
299
		      "swap %u %u\n"
276
		      "intr %u\n"
300
		      "intr %u\n"
277
		      "ctxt %u\n"
301
		      "ctxt %u\n"
278
		      "btime %ld\n",
302
		      "btime %ld\n",
279
		      T2J(cp_time[CP_USER]),
280
		      T2J(cp_time[CP_NICE]),
281
		      T2J(cp_time[CP_SYS] /*+ cp_time[CP_INTR]*/),
282
		      T2J(cp_time[CP_IDLE]),
283
		      cnt.v_vnodepgsin,
303
		      cnt.v_vnodepgsin,
284
		      cnt.v_vnodepgsout,
304
		      cnt.v_vnodepgsout,
285
		      cnt.v_swappgsin,
305
		      cnt.v_swappgsin,

Return to bug 27522