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.14 by ats, Mon Oct 20 18:13:35 2003 UTC vs.
Revision 1.17 by ats, Mon Nov 10 23:25:45 2003 UTC

# Line 28 | Line 28
28   #include <unistd.h>
29   #include <kstat.h>
30   #endif
31 < #ifdef LINUX
31 > #if defined(LINUX) || defined(CYGWIN)
32   #include <stdio.h>
33   #include <string.h>
34   #endif
# Line 49 | Line 49 | mem_stat_t *get_memory_stats(){
49          long totalmem;
50          int pagesize;
51   #endif
52 < #ifdef LINUX
52 > #if defined(LINUX) || defined(CYGWIN)
53          char *line_ptr;
54 +        unsigned long long value;
55          FILE *f;
56   #endif
57   #ifdef FREEBSD
# Line 94 | Line 95 | mem_stat_t *get_memory_stats(){
95          mem_stat.used = mem_stat.total - mem_stat.free;
96   #endif
97  
98 < #ifdef LINUX
99 <        f=fopen("/proc/meminfo", "r");
99 <        if(f==NULL){
98 > #if defined(LINUX) || defined(CYGWIN)
99 >        if ((f = fopen("/proc/meminfo", "r")) == NULL) {
100                  return NULL;
101          }
102  
103 <        if((line_ptr=f_read_line(f, "Mem:"))==NULL){
104 <                fclose(f);
105 <                return NULL;
106 <        }
103 >        while ((line_ptr = f_read_line(f, "")) != NULL) {
104 >                if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
105 >                        continue;
106 >                }
107 >                value *= 1024;
108  
109 <        fclose(f);
110 <
111 <        /* Linux actually stores this as a unsigned long long, but
112 <         * our structures are just long longs. This shouldn't be a
113 <         * problem for sometime yet :)
114 <         */
115 <        if((sscanf(line_ptr,"Mem:  %lld %lld %lld %*d %*d %lld", \
115 <                &mem_stat.total, \
116 <                &mem_stat.used, \
117 <                &mem_stat.free, \
118 <                &mem_stat.cache))!=4){
119 <                        return NULL;
109 >                if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
110 >                        mem_stat.total = value;
111 >                } else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
112 >                        mem_stat.free = value;
113 >                } else if (strncmp(line_ptr, "Cached:", 7) == 0) {
114 >                        mem_stat.cache = value;
115 >                }
116          }
117  
118 +        fclose(f);
119 +        mem_stat.used = mem_stat.total - mem_stat.free;
120   #endif
121  
122   #ifdef FREEBSD

Diff Legend

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