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.19 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.23 by tdb, Wed Apr 7 14:53:40 2004 UTC

# Line 1 | Line 1
1   /*
2 < * i-scream central monitoring system
2 > * i-scream libstatgrab
3   * http://www.i-scream.org
4   * Copyright (C) 2000-2004 i-scream
5   *
# Line 26 | Line 26
26  
27   #include <time.h>
28   #include "statgrab.h"
29 + #include "tools.h"
30   #ifdef SOLARIS
31   #include <kstat.h>
32   #include <sys/sysinfo.h>
# Line 50 | Line 51
51   #include <sys/dkstat.h>
52   #endif
53  
54 < static cpu_states_t cpu_now;
54 > static sg_cpu_stats cpu_now;
55   static int cpu_now_uninit=1;
56  
57 < cpu_states_t *get_cpu_totals(){
57 > sg_cpu_stats *sg_get_cpu_stats(){
58  
59   #ifdef SOLARIS
60 <        kstat_ctl_t *kc;
61 <        kstat_t *ksp;
60 >        kstat_ctl_t *kc;
61 >        kstat_t *ksp;
62          cpu_stat_t cs;
63   #endif
64   #if defined(LINUX) || defined(CYGWIN)
# Line 74 | Line 75 | cpu_states_t *get_cpu_totals(){
75   #endif
76          size_t size;
77   #endif
78 <        
78 >
79          cpu_now.user=0;
80          /* Not stored in linux or freebsd */
81          cpu_now.iowait=0;
# Line 87 | Line 88 | cpu_states_t *get_cpu_totals(){
88          cpu_now.nice=0;
89  
90   #ifdef SOLARIS
91 <        if ((kc = kstat_open()) == NULL) {
92 <                return NULL;
93 <        }
94 <        for (ksp = kc->kc_chain; ksp!=NULL; ksp = ksp->ks_next) {
95 <                if ((strcmp(ksp->ks_module, "cpu_stat")) != 0) continue;
96 <                if (kstat_read(kc, ksp, &cs) == -1) {
97 <                        continue;
98 <                }
91 >        if ((kc = kstat_open()) == NULL) {
92 >                sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
93 >                return NULL;
94 >        }
95 >        for (ksp = kc->kc_chain; ksp!=NULL; ksp = ksp->ks_next) {
96 >                if ((strcmp(ksp->ks_module, "cpu_stat")) != 0) continue;
97 >                if (kstat_read(kc, ksp, &cs) == -1) {
98 >                        continue;
99 >                }
100                  cpu_now.user+=(long long)cs.cpu_sysinfo.cpu[CPU_USER];
101                  cpu_now.iowait+=(long long)cs.cpu_sysinfo.cpu[CPU_WAIT];
102                  cpu_now.kernel+=(long long)cs.cpu_sysinfo.cpu[CPU_KERNEL];
# Line 104 | Line 106 | cpu_states_t *get_cpu_totals(){
106  
107          cpu_now.total=cpu_now.user+cpu_now.iowait+cpu_now.kernel+cpu_now.idle+cpu_now.swap;
108          
109 <        kstat_close(kc);
109 >        kstat_close(kc);
110   #endif
111   #if defined(LINUX) || defined(CYGWIN)
112          if ((f=fopen("/proc/stat", "r" ))==NULL) {
113 +                sg_set_error(SG_ERROR_OPEN, "/proc/stat");
114                  return NULL;
115          }
116          /* The very first line should be cpu */
# Line 116 | Line 119 | cpu_states_t *get_cpu_totals(){
119                  &cpu_now.nice, \
120                  &cpu_now.kernel, \
121                  &cpu_now.idle)) != 4){
122 +                sg_set_error(SG_ERROR_PARSE, "cpu");
123                  fclose(f);
124                  return NULL;
125          }
# Line 128 | Line 132 | cpu_states_t *get_cpu_totals(){
132   #if defined(FREEBSD) || defined(DFBSD)
133          size = sizeof cp_time;
134          if (sysctlbyname("kern.cp_time", &cp_time, &size, NULL, 0) < 0){
135 +                sg_set_error(SG_ERROR_SYSCTLBYNAME, "kern.cp_time");
136                  return NULL;
137          }
138   #else
# Line 139 | Line 144 | cpu_states_t *get_cpu_totals(){
144   #endif
145          size = sizeof cp_time;
146          if (sysctl(mib, 2, &cp_time, &size, NULL, 0) < 0) {
147 + #ifdef NETBSD
148 +                sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_CP_TIME");
149 + #else
150 +                sg_set_error(SG_ERROR_SYSCTL, "CTL_KERN.KERN_CPTIME");
151 + #endif
152                  return NULL;
153          }
154   #endif
# Line 159 | Line 169 | cpu_states_t *get_cpu_totals(){
169          return &cpu_now;
170   }
171  
172 < cpu_states_t *get_cpu_diff(){
173 <        static cpu_states_t cpu_diff;
174 <        cpu_states_t cpu_then, *cpu_tmp;
172 > sg_cpu_stats *sg_get_cpu_stats_diff(){
173 >        static sg_cpu_stats cpu_diff;
174 >        sg_cpu_stats cpu_then, *cpu_tmp;
175  
176          if (cpu_now_uninit){
177 <                if((cpu_tmp=get_cpu_totals())==NULL){
178 <                /* Should get_cpu_totals fail */
177 >                if((cpu_tmp=sg_get_cpu_stats())==NULL){
178 >                        /* Should sg_get_cpu_stats fail */
179                          return NULL;
180                  }
181                  return cpu_tmp;
182          }
183  
184  
185 <        cpu_then.user=cpu_now.user;
186 <        cpu_then.kernel=cpu_now.kernel;
187 <        cpu_then.idle=cpu_now.idle;
188 <        cpu_then.iowait=cpu_now.iowait;
189 <        cpu_then.swap=cpu_now.swap;
190 <        cpu_then.nice=cpu_now.nice;
191 <        cpu_then.total=cpu_now.total;
192 <        cpu_then.systime=cpu_now.systime;
185 >        cpu_then.user=cpu_now.user;
186 >        cpu_then.kernel=cpu_now.kernel;
187 >        cpu_then.idle=cpu_now.idle;
188 >        cpu_then.iowait=cpu_now.iowait;
189 >        cpu_then.swap=cpu_now.swap;
190 >        cpu_then.nice=cpu_now.nice;
191 >        cpu_then.total=cpu_now.total;
192 >        cpu_then.systime=cpu_now.systime;
193  
194 <        if((cpu_tmp=get_cpu_totals())==NULL){
194 >        if((cpu_tmp=sg_get_cpu_stats())==NULL){
195                  return NULL;
196          }
197  
# Line 197 | Line 207 | cpu_states_t *get_cpu_diff(){
207          return &cpu_diff;
208   }
209  
210 < cpu_percent_t *cpu_percent_usage(){
211 <        static cpu_percent_t cpu_usage;
212 <        cpu_states_t *cs_ptr;
210 > sg_cpu_percents *sg_get_cpu_percents(){
211 >        static sg_cpu_percents cpu_usage;
212 >        sg_cpu_stats *cs_ptr;
213  
214 <        cs_ptr=get_cpu_diff();
214 >        cs_ptr=sg_get_cpu_stats_diff();
215          if(cs_ptr==NULL){
216                  return NULL;
217          }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines