ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/cpu_stats.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/cpu_stats.c (file contents):
Revision 1.24 by ats, Sun Jul 18 21:30:11 2004 UTC vs.
Revision 1.28 by tdb, Tue Jun 17 15:52:52 2008 UTC

# Line 50 | Line 50
50   #include <sys/sysctl.h>
51   #include <sys/dkstat.h>
52   #endif
53 + #ifdef HPUX
54 + #include <sys/param.h>
55 + #include <sys/pstat.h>
56 + #include <sys/dk.h>
57 + #endif
58 + #ifdef WIN32
59 + #include <pdh.h>
60 + #include "win32.h"
61 + #endif
62  
63   static sg_cpu_stats cpu_now;
64   static int cpu_now_uninit=1;
65  
66   sg_cpu_stats *sg_get_cpu_stats(){
67  
68 + #ifdef HPUX
69 +        struct pst_dynamic pstat_dynamic;
70 +        int i;
71 + #endif
72   #ifdef SOLARIS
73          kstat_ctl_t *kc;
74          kstat_t *ksp;
# Line 63 | Line 76 | sg_cpu_stats *sg_get_cpu_stats(){
76   #endif
77   #if defined(LINUX) || defined(CYGWIN)
78          FILE *f;
79 +        int proc_stat_cpu;
80   #endif
81   #ifdef ALLBSD
82   #if defined(NETBSD) || defined(OPENBSD)
# Line 81 | Line 95 | sg_cpu_stats *sg_get_cpu_stats(){
95          cpu_now.iowait=0;
96          cpu_now.kernel=0;
97          cpu_now.idle=0;
98 <        /* Not stored in linux or freebsd */
98 >        /* Not stored in linux, freebsd, hpux or windows */
99          cpu_now.swap=0;
100          cpu_now.total=0;
101 <        /* Not stored in solaris */
101 >        /* Not stored in solaris or windows */
102          cpu_now.nice=0;
103  
104 + #ifdef HPUX
105 +        if (pstat_getdynamic(&pstat_dynamic, sizeof(pstat_dynamic), 1, 0) == -1) {
106 +                sg_set_error_with_errno(SG_ERROR_PSTAT, "pstat_dynamic");
107 +                return NULL;
108 +        }
109 +        cpu_now.user   = pstat_dynamic.psd_cpu_time[CP_USER];
110 +        cpu_now.iowait = pstat_dynamic.psd_cpu_time[CP_WAIT];
111 +        cpu_now.kernel = pstat_dynamic.psd_cpu_time[CP_SSYS] + pstat_dynamic.psd_cpu_time[CP_SYS];
112 +        cpu_now.idle   = pstat_dynamic.psd_cpu_time[CP_IDLE];
113 +        cpu_now.nice   = pstat_dynamic.psd_cpu_time[CP_NICE];
114 +        for (i = 0; i < PST_MAX_CPUSTATES; i++) {
115 +                cpu_now.total += pstat_dynamic.psd_cpu_time[i];
116 +        }
117 + #endif
118   #ifdef SOLARIS
119          if ((kc = kstat_open()) == NULL) {
120                  sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
# Line 98 | Line 126 | sg_cpu_stats *sg_get_cpu_stats(){
126                          continue;
127                  }
128                  cpu_now.user+=(long long)cs.cpu_sysinfo.cpu[CPU_USER];
101                cpu_now.iowait+=(long long)cs.cpu_sysinfo.cpu[CPU_WAIT];
129                  cpu_now.kernel+=(long long)cs.cpu_sysinfo.cpu[CPU_KERNEL];
130                  cpu_now.idle+=(long long)cs.cpu_sysinfo.cpu[CPU_IDLE];
131 <                cpu_now.swap+=(long long)cs.cpu_sysinfo.cpu[CPU_STATES];
131 >                cpu_now.iowait+=(long long)cs.cpu_sysinfo.wait[W_IO]+(long long)cs.cpu_sysinfo.wait[W_PIO];
132 >                cpu_now.swap+=(long long)cs.cpu_sysinfo.wait[W_SWAP];
133          }
134  
135          cpu_now.total=cpu_now.user+cpu_now.iowait+cpu_now.kernel+cpu_now.idle+cpu_now.swap;
# Line 113 | Line 141 | sg_cpu_stats *sg_get_cpu_stats(){
141                  sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/stat");
142                  return NULL;
143          }
144 +
145          /* The very first line should be cpu */
146 <        if((fscanf(f, "cpu %lld %lld %lld %lld", \
146 >        proc_stat_cpu = fscanf(f, "cpu %lld %lld %lld %lld %lld", \
147                  &cpu_now.user, \
148                  &cpu_now.nice, \
149                  &cpu_now.kernel, \
150 <                &cpu_now.idle)) != 4){
150 >                &cpu_now.idle, \
151 >                &cpu_now.iowait);
152 >
153 >        fclose(f);
154 >
155 >        if (proc_stat_cpu < 4 || proc_stat_cpu > 5) {
156                  sg_set_error(SG_ERROR_PARSE, "cpu");
123                fclose(f);
157                  return NULL;
158          }
159  
160 <        fclose(f);
160 >        /* older linux doesn't give iowait */
161 >        if (proc_stat_cpu == 4) {
162 >                cpu_now.iowait = 0;
163 >        }
164  
165          cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
166   #endif
# Line 163 | Line 199 | sg_cpu_stats *sg_get_cpu_stats(){
199          cpu_now.total=cpu_now.user+cpu_now.nice+cpu_now.kernel+cpu_now.idle;
200  
201   #endif
202 + #ifdef WIN32
203 +        sg_set_error(SG_ERROR_UNSUPPORTED, "Win32");
204 +        return NULL;
205 + #endif
206  
207          cpu_now.systime=time(NULL);
208          cpu_now_uninit=0;
# Line 211 | Line 251 | sg_cpu_stats *sg_get_cpu_stats_diff(){
251  
252   sg_cpu_percents *sg_get_cpu_percents(){
253          static sg_cpu_percents cpu_usage;
254 + #ifndef WIN32
255          sg_cpu_stats *cs_ptr;
256  
257          cs_ptr=sg_get_cpu_stats_diff();
# Line 225 | Line 266 | sg_cpu_percents *sg_get_cpu_percents(){
266          cpu_usage.swap = ((float)cs_ptr->swap / (float)cs_ptr->total)*100;
267          cpu_usage.nice = ((float)cs_ptr->nice / (float)cs_ptr->total)*100;
268          cpu_usage.time_taken = cs_ptr->systime;
269 + #else
270 +        double result;
271  
272 <        return &cpu_usage;
272 >        if(read_counter_double(SG_WIN32_PROC_USER, &result)) {
273 >                sg_set_error(SG_ERROR_PDHREAD, PDH_USER);
274 >                return NULL;
275 >        }
276 >        cpu_usage.user = (float)result;
277 >        if(read_counter_double(SG_WIN32_PROC_PRIV, &result)) {
278 >                sg_set_error(SG_ERROR_PDHREAD, PDH_PRIV);
279 >                return NULL;
280 >        }
281 >        cpu_usage.kernel = (float)result;
282 >        if(read_counter_double(SG_WIN32_PROC_IDLE, &result)) {
283 >                sg_set_error(SG_ERROR_PDHREAD, PDH_IDLE);
284 >                return NULL;
285 >        }
286 >        /* win2000 does not have an idle counter, but does have %activity
287 >         * so convert it to idle */
288 >        cpu_usage.idle = 100 - (float)result;
289 >        if(read_counter_double(SG_WIN32_PROC_INT, &result)) {
290 >                sg_set_error(SG_ERROR_PDHREAD, PDH_INTER);
291 >                return NULL;
292 >        }
293 >        cpu_usage.iowait = (float)result;
294 > #endif
295  
296 +        return &cpu_usage;
297   }
298  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines