ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/cpu_stats.c

Comparing projects/libstatgrab/src/libstatgrab/cpu_stats.c (file contents):
Revision 1.12 by ats, Sat Oct 18 23:04:23 2003 UTC vs.
Revision 1.13 by ats, Sun Oct 19 02:03:02 2003 UTC

#	Line 36 | Line 36
36		#include <sys/sysctl.h>
37		#include <sys/dkstat.h>
38		#endif
39	+	#ifdef NETBSD
40	+	#include <sys/types.h>
41	+	#include <sys/param.h>
42	+	#include <sys/sysctl.h>
43	+	#include <sys/sched.h>
44	+	#endif
45
46		static cpu_states_t cpu_now;
47		static int cpu_now_uninit=1;
#	Line 50 | Line 56 | cpu_states_t *get_cpu_totals(){
56		#ifdef LINUX
57		FILE *f;
58		#endif
59	<	#ifdef FREEBSD
59	>	#ifdef ALLBSD
60	>	#ifndef FREEBSD
61	>	int mib[2];
62	>	#endif
63	>	#ifdef NETBSD
64	>	u_int64_t cp_time[CPUSTATES];
65	>	#else
66		long cp_time[CPUSTATES];
67	+	#endif
68		size_t size;
69		#endif
70
#	Line 104 | Line 117 | cpu_states_t *get_cpu_totals(){
117
118		cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
119		#endif
120	+	#ifdef ALLBSD
121		#ifdef FREEBSD
122		size = sizeof cp_time;
123		if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) < 0){
124		return NULL;
125		}
126	+	#else
127	+	mib[0] = CTL_KERN;
128	+	mib[1] = KERN_CP_TIME;
129	+	size = sizeof cp_time;
130	+	if (sysctl(mib, 2, &cp_time, &size, NULL, 0) < 0) {
131	+	return NULL;
132	+	}
133	+	#endif
134
135		cpu_now.user=cp_time[CP_USER];
136		cpu_now.nice=cp_time[CP_NICE];

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines