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

Comparing projects/libstatgrab/src/libstatgrab/memory_stats.c (file contents):
Revision 1.12 by ats, Sun Oct 19 02:03:02 2003 UTC vs.
Revision 1.15 by ats, Fri Oct 24 17:03:20 2003 UTC

# Line 32 | Line 32
32   #include <stdio.h>
33   #include <string.h>
34   #endif
35 #ifdef ALLBSD
35   #ifdef FREEBSD
36   #include <sys/types.h>
37   #include <sys/sysctl.h>
39 #else
40 #include <sys/param.h>
41 #include <sys/sysctl.h>
42 #endif
38   #include <unistd.h>
39   #endif
40  
# Line 56 | Line 51 | mem_stat_t *get_memory_stats(){
51   #endif
52   #ifdef LINUX
53          char *line_ptr;
54 +        unsigned long long value;
55          FILE *f;
56   #endif
61 #ifdef ALLBSD
62        int mib[2];
57   #ifdef FREEBSD
58 +        int mib[2];
59 +        u_long physmem;
60 +        size_t size;
61          u_int free_count;
62          u_int cache_count;
63          u_int inactive_count;
# Line 69 | Line 66 | mem_stat_t *get_memory_stats(){
66   #ifdef NETBSD
67          struct uvmexp *uvm;
68   #endif
72        u_long physmem;
73        size_t size;
74 #endif
69  
70   #ifdef SOLARIS
71          if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
# Line 102 | Line 96 | mem_stat_t *get_memory_stats(){
96   #endif
97  
98   #ifdef LINUX
99 <        f=fopen("/proc/meminfo", "r");
100 <        if(f==NULL){
99 >        f = fopen("/proc/meminfo", "r");
100 >        if (f == NULL) {
101                  return NULL;
102          }
103  
104 <        if((line_ptr=f_read_line(f, "Mem:"))==NULL){
105 <                fclose(f);
106 <                return NULL;
107 <        }
104 >        while ((line_ptr = f_read_line(f, "")) != NULL) {
105 >                if (sscanf(line_ptr, "%*s %lld kB", &value) != 2) {
106 >                        continue;
107 >                }
108 >                value *= 1024;
109  
110 <        fclose(f);
111 <
112 <        /* Linux actually stores this as a unsigned long long, but
113 <         * our structures are just long longs. This shouldn't be a
114 <         * problem for sometime yet :)
115 <         */
116 <        if((sscanf(line_ptr,"Mem:  %lld %lld %lld %*d %*d %lld", \
122 <        size = sizeof physmem;
123 <                &mem_stat.total, \
124 <                &mem_stat.used, \
125 <                &mem_stat.free, \
126 <                &mem_stat.cache))!=4){
127 <                        return NULL;
110 >                if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
111 >                        mem_stat.total = value;
112 >                } else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
113 >                        mem_stat.free = value;
114 >                } else if (strncmp(line_ptr, "Cached:", 7) == 0) {
115 >                        mem_stat.cache = value;
116 >                }
117          }
118  
119 +        fclose(f);
120 +        mem_stat.used = mem_stat.total - mem_stat.free;
121   #endif
122  
123 < #ifdef ALLBSD
123 > #ifdef FREEBSD
124          /* Returns bytes */
125          mib[0] = CTL_HW;
126          mib[1] = HW_PHYSMEM;
# Line 140 | Line 131 | mem_stat_t *get_memory_stats(){
131          mem_stat.total = physmem;
132  
133          /*returns pages*/
143 #ifdef FREEBSD
134          size = sizeof free_count;
135          if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
136                  return NULL;
# Line 172 | Line 162 | mem_stat_t *get_memory_stats(){
162          mem_stat.free=(free_count*pagesize)+(inactive_count*pagesize);
163          mem_stat.used=physmem-mem_stat.free;
164   #endif
165 +
166   #ifdef NETBSD
176        /* FIXME This is not consistent with the FreeBSD logic above. */
167          if ((uvm = get_uvmexp()) == NULL) {
168                  return NULL;
169          }
170 +        mem_stat.total = uvm->pagesize * uvm->npages;
171          mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
172 <        mem_stat.free = uvm->pagesize * uvm->free;
173 <        mem_stat.used = uvm->pagesize * (uvm->npages - uvm->free);
172 >        mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
173 >        mem_stat.used = mem_stat.total - mem_stat.free;
174   #endif
184 #endif
175  
176          return &mem_stat;
187
177   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines