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

Comparing projects/libstatgrab/src/libstatgrab/process_stats.c (file contents):
Revision 1.62 by pajs, Wed Apr 7 14:45:33 2004 UTC vs.
Revision 1.64 by pajs, Wed Apr 7 15:46:34 2004 UTC

# Line 84 | Line 84 | static void proc_state_destroy(sg_process_stats *s) {
84  
85   sg_process_stats *sg_get_process_stats(int *entries){
86          VECTOR_DECLARE_STATIC(proc_state, sg_process_stats, 64,
87 <                              proc_state_init, proc_state_destroy);
87 >                              proc_state_init, proc_state_destroy);
88          int proc_state_size = 0;
89          sg_process_stats *proc_state_ptr;
90   #ifdef ALLBSD
# Line 107 | Line 107 | sg_process_stats *sg_get_process_stats(int *entries){
107   #endif
108   #endif
109   #if defined(SOLARIS) || defined(LINUX)
110 <        DIR *proc_dir;
111 <        struct dirent *dir_entry;
112 <        char filename[MAX_FILE_LENGTH];
113 <        FILE *f;
110 >        DIR *proc_dir;
111 >        struct dirent *dir_entry;
112 >        char filename[MAX_FILE_LENGTH];
113 >        FILE *f;
114   #ifdef SOLARIS
115          psinfo_t process_info;
116   #endif
# Line 138 | Line 138 | sg_process_stats *sg_get_process_stats(int *entries){
138          fclose(f);
139   #endif
140  
141 <        if((proc_dir=opendir(PROC_LOCATION))==NULL){
142 <                return NULL;
143 <        }
141 >        if((proc_dir=opendir(PROC_LOCATION))==NULL){
142 >                return NULL;
143 >        }
144  
145 <        while((dir_entry=readdir(proc_dir))!=NULL){
146 <                if(atoi(dir_entry->d_name) == 0) continue;
145 >        while((dir_entry=readdir(proc_dir))!=NULL){
146 >                if(atoi(dir_entry->d_name) == 0) continue;
147  
148   #ifdef SOLARIS
149 <                snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
149 >                snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
150   #endif
151   #ifdef LINUX
152                  snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/stat", dir_entry->d_name);
153   #endif
154 <                if((f=fopen(filename, "r"))==NULL){
155 <                        /* Open failed.. Process since vanished, or the path was too long.
156 <                         * Ah well, move onwards to the next one */
157 <                        continue;
158 <                }
154 >                if((f=fopen(filename, "r"))==NULL){
155 >                        /* Open failed.. Process since vanished, or the path was too long.
156 >                         * Ah well, move onwards to the next one */
157 >                        continue;
158 >                }
159   #ifdef SOLARIS
160 <                fread(&process_info, sizeof(psinfo_t), 1, f);
160 >                fread(&process_info, sizeof(psinfo_t), 1, f);
161 >                fclose(f);
162   #endif
163  
164                  if (VECTOR_RESIZE(proc_state, proc_state_size + 1) < 0) {
# Line 177 | Line 178 | sg_process_stats *sg_get_process_stats(int *entries){
178                  proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
179                  proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
180                  proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
181 +                proc_state_ptr->nice = (int)process_info.pr_lwp.pr_nice - 20;
182                  if (sg_update_string(&proc_state_ptr->process_name,
183 <                                     process_info.pr_fname) < 0) {
183 >                                     process_info.pr_fname) < 0) {
184                          return NULL;
185                  }
186                  if (sg_update_string(&proc_state_ptr->proctitle,
187 <                                     process_info.pr_psargs) < 0) {
187 >                                     process_info.pr_psargs) < 0) {
188                          return NULL;
189                  }
190  
191 <                if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
192 <                if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
193 <                if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
194 <                if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
195 <                if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
191 >                if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
192 >                if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
193 >                if(process_info.pr_lwp.pr_state==3) proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
194 >                if(process_info.pr_lwp.pr_state==4) proc_state_ptr->state = SG_PROCESS_STATE_STOPPED;
195 >                if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
196   #endif
197   #ifdef LINUX
198                  x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*u %*u %*u %*u %*u %lu %lu %*d %*d %*d %d %*d %*d %lu %llu %llu %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*u %*d %*d\n", &(proc_state_ptr->pid), ps_name, &s, &(proc_state_ptr->parent), &(proc_state_ptr->pgid), &utime, &stime, &(proc_state_ptr->nice), &starttime, &(proc_state_ptr->proc_size), &(proc_state_ptr->proc_resident));
# Line 207 | Line 209 | sg_process_stats *sg_get_process_stats(int *entries){
209                  if(ptr !=NULL) *ptr='\0';
210  
211                  if (sg_update_string(&proc_state_ptr->process_name,
212 <                                     &ps_name[1]) < 0) {
212 >                                     &ps_name[1]) < 0) {
213                          return NULL;
214                  }
215  
216                  /* cpu */
217                  proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
218  
219 <                fclose(f);
219 >                fclose(f);
220  
221                  /* uid / gid */
222                  snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
223 <                if ((f=fopen(filename, "r")) == NULL) {
224 <                        /* Open failed.. Process since vanished, or the path was too long.
225 <                         * Ah well, move onwards to the next one */
226 <                        continue;
227 <                }
223 >                if ((f=fopen(filename, "r")) == NULL) {
224 >                        /* Open failed.. Process since vanished, or the path was too long.
225 >                         * Ah well, move onwards to the next one */
226 >                        continue;
227 >                }
228  
229                  if((ptr=sg_f_read_line(f, "Uid:"))==NULL){
230                          fclose(f);
# Line 231 | Line 233 | sg_process_stats *sg_get_process_stats(int *entries){
233                  sscanf(ptr, "Uid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->uid), &(proc_state_ptr->euid));
234  
235                  if((ptr=sg_f_read_line(f, "Gid:"))==NULL){
236 <                        fclose(f);
237 <                        continue;
238 <                }
239 <                sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
236 >                        fclose(f);
237 >                        continue;
238 >                }
239 >                sscanf(ptr, "Gid:\t%d\t%d\t%*d\t%*d\n", &(proc_state_ptr->gid), &(proc_state_ptr->egid));
240  
241                  fclose(f);
242  
243                  /* proctitle */
244                  snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/cmdline", dir_entry->d_name);
245  
246 <                if((fn=open(filename, O_RDONLY)) == -1){
247 <                        /* Open failed.. Process since vanished, or the path was too long.
248 <                         * Ah well, move onwards to the next one */
249 <                        continue;
250 <                }
246 >                if((fn=open(filename, O_RDONLY)) == -1){
247 >                        /* Open failed.. Process since vanished, or the path was too long.
248 >                         * Ah well, move onwards to the next one */
249 >                        continue;
250 >                }
251  
252   #define READ_BLOCK_SIZE 128
253                  len = 0;
# Line 291 | Line 293 | sg_process_stats *sg_get_process_stats(int *entries){
293   #endif
294  
295                  proc_state_size++;
296 <        }
297 <        closedir(proc_dir);
296 >        }
297 >        closedir(proc_dir);
298   #endif
299  
300   #ifdef ALLBSD

Diff Legend

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