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.22 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.23 by pajs, Sun Mar 28 18:04:14 2004 UTC

# Line 34 | Line 34
34   #include <string.h>
35   #endif
36  
37 #include "tools.h"
37   #ifdef SOLARIS
38   #include <procfs.h>
39   #include <limits.h>
# Line 57 | Line 56
56   #endif
57   #endif
58  
59 < process_stat_t *get_process_stats(){
60 <
61 <        static process_stat_t process_stat;
62 <
63 < #if defined(SOLARIS) || defined(LINUX)
64 <        DIR *proc_dir;
65 <        struct dirent *dir_entry;
66 <        char filename[MAX_FILE_LENGTH];
67 <        FILE *f;
69 < #endif
70 < #ifdef LINUX
71 <        char *line_ptr;
72 < #endif
73 < #ifdef SOLARIS
59 > int get_proc_snapshot(proc_state_t **ps){
60 >        proc_state_t *proc_state = NULL;
61 >        proc_state_t *proc_state_ptr;
62 >        int proc_state_size = 0;
63 > #if defined(SOLARIS)    
64 >        DIR *proc_dir;
65 >        struct dirent *dir_entry;
66 >        char filename[MAX_FILE_LENGTH];
67 >        FILE *f;
68          psinfo_t process_info;
75 #endif
76 #ifdef ALLBSD
77        int mib[3];
78        size_t size;
79        struct kinfo_proc *kp_stats;    
80        int procs, i;
81 #endif
69  
70 <        process_stat.sleeping=0;
71 <        process_stat.running=0;
72 <        process_stat.zombie=0;
86 <        process_stat.stopped=0;
87 <        process_stat.total=0;
70 >        if((proc_dir=opendir(PROC_LOCATION))==NULL){
71 >                return NULL;
72 >        }
73  
74 < #if defined(SOLARIS) || defined(LINUX)
75 <        if((proc_dir=opendir(PROC_LOCATION))==NULL){
91 <                return NULL;
92 <        }
74 >        while((dir_entry=readdir(proc_dir))!=NULL){
75 >                if(atoi(dir_entry->d_name) == 0) continue;
76  
77 <        while((dir_entry=readdir(proc_dir))!=NULL){
95 <                if(atoi(dir_entry->d_name) == 0) continue;
77 >                snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
78  
79 < #ifdef SOLARIS
80 <                snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/psinfo", dir_entry->d_name);
81 < #endif
82 < #ifdef LINUX
83 <                snprintf(filename, MAX_FILE_LENGTH, "/proc/%s/status", dir_entry->d_name);
84 < #endif
79 >                if((f=fopen(filename, "r"))==NULL){
80 >                        /* Open failed.. Process since vanished, or the path was too long.
81 >                         * Ah well, move onwards to the next one */
82 >                        continue;
83 >                }
84 >                fread(&process_info, sizeof(psinfo_t), 1, f);
85  
86 <                if((f=fopen(filename, "r"))==NULL){
105 <                        /* Open failed.. Process since vanished, or the path was too long.
106 <                         * Ah well, move onwards to the next one */
107 <                        continue;
108 <                }
86 >                proc_state = realloc(proc_state, (1+proc_state_size)*sizeof(proc_state_t));
87  
88 < #ifdef SOLARIS
89 <                fread(&process_info, sizeof(psinfo_t), 1, f);
90 <                if(process_info.pr_lwp.pr_state==1) process_stat.sleeping++;
91 <                if(process_info.pr_lwp.pr_state==2) process_stat.running++;
92 <                if(process_info.pr_lwp.pr_state==3) process_stat.zombie++;
93 <                if(process_info.pr_lwp.pr_state==4) process_stat.stopped++;
94 <                if(process_info.pr_lwp.pr_state==6) process_stat.running++;
95 < #endif
96 < #ifdef LINUX
97 <                if((line_ptr=f_read_line(f, "State:"))==NULL){
98 <                        fclose(f);
99 <                        continue;
100 <                }
101 <                if((line_ptr=strchr(line_ptr, '\t'))==NULL){
102 <                        fclose(f);
125 <                        continue;
126 <                }
127 <                line_ptr++;
128 <                if(line_ptr=='\0'){
129 <                        fclose(f);
130 <                        continue;
131 <                }
88 >                proc_state_ptr = proc_state+proc_state_size;
89 >                
90 >                proc_state_ptr->pid = process_info.pr_pid;
91 >                proc_state_ptr->parent = process_info.pr_ppid;
92 >                proc_state_ptr->pgid = process_info.pr_pgid;
93 >                proc_state_ptr->uid = process_info.pr_uid;
94 >                proc_state_ptr->euid = process_info.pr_euid;
95 >                proc_state_ptr->gid = process_info.pr_gid;
96 >                proc_state_ptr->egid = process_info.pr_egid;
97 >                proc_state_ptr->proc_size = (process_info.pr_size) * 1024;
98 >                proc_state_ptr->proc_resident = (process_info.pr_rssize) * 1024;
99 >                proc_state_ptr->time_spent = process_info.pr_time.tv_sec;
100 >                proc_state_ptr->cpu_percent = (process_info.pr_pctcpu * 100.0) / 0x8000;
101 >                proc_state_ptr->process_name = strdup(process_info.pr_fname);
102 >                proc_state_ptr->proctitle = strdup(process_info.pr_psargs);
103  
104 <                if(*line_ptr=='S') process_stat.sleeping++;
134 <                if(*line_ptr=='R') process_stat.running++;
135 <                if(*line_ptr=='Z') process_stat.zombie++;
136 <                if(*line_ptr=='T') process_stat.stopped++;
137 <                if(*line_ptr=='D') process_stat.stopped++;
138 < #endif  
139 <
140 <                fclose(f);
141 <        }
142 <        closedir(proc_dir);
104 >                proc_state_size++;
105   #endif
144 #ifdef ALLBSD
145        mib[0] = CTL_KERN;
146        mib[1] = KERN_PROC;
147        mib[2] = KERN_PROC_ALL;
106  
149        if (sysctl(mib, 3, NULL, &size, NULL, 0) < 0) {
150                return NULL;
151        }
152        
153        procs = size / sizeof(struct kinfo_proc);
107  
108 <        kp_stats = malloc(size);
109 <        if (kp_stats == NULL) {
110 <                return NULL;
111 <        }
159 <        
160 <        if (sysctl(mib, 3, kp_stats, &size, NULL, 0) < 0) {
161 <                free(kp_stats);
162 <                return NULL;
163 <        }
108 >                fclose(f);
109 >        }
110 >        closedir(proc_dir);
111 >        *ps = proc_state;
112  
113 <        for (i = 0; i < procs; i++) {
166 < #ifdef FREEBSD5
167 <                switch (kp_stats[i].ki_stat) {
168 < #else
169 <                switch (kp_stats[i].kp_proc.p_stat) {
170 < #endif
171 <                case SIDL:
172 <                case SRUN:
173 < #ifdef SONPROC
174 <                case SONPROC: /* NetBSD */
175 < #endif
176 <                        process_stat.running++;
177 <                        break;
178 <                case SSLEEP:
179 < #ifdef SWAIT
180 <                case SWAIT: /* FreeBSD 5 */
181 < #endif
182 < #ifdef SLOCK
183 <                case SLOCK: /* FreeBSD 5 */
184 < #endif
185 <                        process_stat.sleeping++;
186 <                        break;
187 <                case SSTOP:
188 <                        process_stat.stopped++;
189 <                        break;
190 <                case SZOMB:
191 < #ifdef SDEAD
192 <                case SDEAD: /* OpenBSD & NetBSD */
193 < #endif
194 <                        process_stat.zombie++;
195 <                        break;
196 <                }
197 <        }
198 <
199 <        free(kp_stats);
200 < #endif
201 <
202 < #ifdef CYGWIN
203 <        return NULL;
204 < #endif
205 <
206 <        process_stat.total=process_stat.sleeping+process_stat.running+process_stat.zombie+process_stat.stopped;
207 <
208 <        return &process_stat;
113 >        return proc_state_size;
114   }
115 +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines