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.55 by tdb, Tue Apr 6 13:40:41 2004 UTC vs.
Revision 1.60 by ats, Wed Apr 7 10:27:53 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 65 | Line 65
65   #include <limits.h>
66   #if (defined(FREEBSD) && !defined(FREEBSD5)) || defined(DFBSD)
67   #include <kvm.h>
68 – #include <tools.h>
68   #endif
69   #include <unistd.h>
70   #ifdef NETBSD2
# Line 121 | Line 120 | sg_process_stats *sg_get_process_stats(int *entries){
120          char ps_name[4096];
121          char *ptr;
122          VECTOR_DECLARE_STATIC(psargs, char, 128, NULL, NULL);
123 <        unsigned long stime, utime;
123 >        unsigned long stime, utime, starttime;
124          int x;
125          int fn;
126          int len;
127          int rc;
128 +        time_t uptime;
129   #endif
130  
131 + #ifdef LINUX
132 +        if ((f=fopen("/proc/uptime", "r")) == NULL) {
133 +                return NULL;
134 +        }
135 +        if((fscanf(f,"%lu %*d",&uptime)) != 1){
136 +                return NULL;
137 +        }
138 +        fclose(f);
139 + #endif
140 +
141          if((proc_dir=opendir(PROC_LOCATION))==NULL){
142                  return NULL;
143          }
# Line 167 | Line 177 | sg_process_stats *sg_get_process_stats(int *entries){
177                  proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
178                  proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
179                  proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
180 <                proc_state_ptr->process_name = strdup(process_info.pr_fname);
181 <                proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
180 >                if (sg_update_string(&proc_state_ptr->process_name,
181 >                                     process_info.pr_fname) < 0) {
182 >                        return NULL;
183 >                }
184 >                if (sg_update_string(&proc_state_ptr->proctitle,
185 >                                     process_info.pr_psargs) < 0) {
186 >                        return NULL;
187 >                }
188  
189                  if(process_info.pr_lwp.pr_state==1) proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
190                  if(process_info.pr_lwp.pr_state==2) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
# Line 177 | Line 193 | sg_process_stats *sg_get_process_stats(int *entries){
193                  if(process_info.pr_lwp.pr_state==6) proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
194   #endif
195   #ifdef LINUX
196 <                x = fscanf(f, "%d %4096s %c %d %d %*d %*d %*d %*u %*u %*u %*u %*u %lu %lu %*d %*d %*d %d %*d %*d %*u %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), &(proc_state_ptr->proc_size), &(proc_state_ptr->proc_resident));
197 <                proc_state_ptr->proc_resident = proc_state_ptr->proc_resident * getpagesize();
196 >                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));
197 >                /* +3 becuase man page says "Resident  Set Size: number of pages the process has in real memory, minus 3 for administrative purposes." */
198 >                proc_state_ptr->proc_resident = (proc_state_ptr->proc_resident + 3) * getpagesize();
199                  if(s == 'S') proc_state_ptr->state = SG_PROCESS_STATE_SLEEPING;
200                  if(s == 'R') proc_state_ptr->state = SG_PROCESS_STATE_RUNNING;
201                  if(s == 'Z') proc_state_ptr->state = SG_PROCESS_STATE_ZOMBIE;
# Line 194 | Line 211 | sg_process_stats *sg_get_process_stats(int *entries){
211                          return NULL;
212                  }
213  
214 <                /* Need to do cpu */
215 <                
214 >                /* cpu */
215 >                proc_state_ptr->cpu_percent = (100.0 * (utime + stime)) / ((uptime * 100.0) - starttime);
216 >                printf("%s  ut: %lu st: %lu up: %lu start: %lu\n", proc_state_ptr->process_name, utime, stime, uptime , starttime);
217  
218                  fclose(f);
219  
# Line 322 | Line 340 | sg_process_stats *sg_get_process_stats(int *entries){
340                          return NULL;
341                  }
342   #else
343 +                /* FIXME - this value can be too large on some of
344 +                   the BSD's, which causes sysctl not to return
345 +                   anything. Maybe we need something smaller? */
346                  mib[1] = KERN_ARGMAX;
347  
348                  if(sysctl(mib, 2, &buflen, &size, NULL, 0) < 0) {

Diff Legend

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