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

Comparing projects/libstatgrab/src/libstatgrab/swap_stats.c (file contents):
Revision 1.6 by ats, Sun Oct 19 00:25:30 2003 UTC vs.
Revision 1.8 by ats, Fri Oct 24 17:26:43 2003 UTC

# Line 31 | Line 31
31   #endif
32   #ifdef LINUX
33   #include <stdio.h>
34 + #include <string.h>
35   #endif
36   #ifdef FREEBSD
37   #include <unistd.h>
# Line 49 | Line 50 | swap_stat_t *get_swap_stats(){
50   #ifdef LINUX
51          FILE *f;
52          char *line_ptr;
53 +        unsigned long long value;
54   #endif
55   #ifdef FREEBSD
56          struct kvm_swap swapinfo;
57          int pagesize;
58          kvm_t *kvmd;
59   #endif
60 + #ifdef NETBSD
61 +        struct uvmexp *uvm;
62 + #endif
63  
64   #ifdef SOLARIS
65          if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
# Line 68 | Line 73 | swap_stat_t *get_swap_stats(){
73          swap_stat.free = swap_stat.total - swap_stat.used;
74   #endif
75   #ifdef LINUX
76 <        if ((f=fopen("/proc/meminfo", "r" ))==NULL) {
76 >        if ((f = fopen("/proc/meminfo", "r")) == NULL) {
77                  return NULL;
78          }
79 <        if((line_ptr=f_read_line(f, "Swap:"))==NULL){
80 <                fclose(f);
81 <                return NULL;
79 >
80 >        while ((line_ptr = f_read_line(f, "")) != NULL) {
81 >                if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
82 >                        continue;
83 >                }
84 >                value *= 1024;
85 >
86 >                if (strncmp(line_ptr, "SwapTotal:", 10) == 0) {
87 >                        swap_stat.total = value;
88 >                } else if (strncmp(line_ptr, "SwapFree:", 9) == 0) {
89 >                        swap_stat.free = value;
90 >                }
91          }
92 <        if((sscanf(line_ptr, "Swap: %lld %lld %lld", &swap_stat.total, &swap_stat.used, &swap_stat.free))!=3){
79 <                fclose(f);
80 <                return NULL;
81 <        }
92 >
93          fclose(f);
94 +        swap_stat.used = swap_stat.total - swap_stat.free;
95   #endif
96   #ifdef FREEBSD
97          if((kvmd = get_kvm()) == NULL){
# Line 93 | Line 105 | swap_stat_t *get_swap_stats(){
105          swap_stat.total= (long long)swapinfo.ksw_total * (long long)pagesize;
106          swap_stat.used = (long long)swapinfo.ksw_used * (long long)pagesize;
107          swap_stat.free = swap_stat.total-swap_stat.used;
108 + #endif
109 + #ifdef NETBSD
110 +        if ((uvm = get_uvmexp()) == NULL) {
111 +                return NULL;
112 +        }
113 +
114 +        swap_stat.total = (long long)uvm->pagesize * (long long)uvm->swpages;
115 +        swap_stat.used = (long long)uvm->pagesize * (long long)uvm->swpginuse;
116 +        swap_stat.free = swap_stat.total - swap_stat.used;
117   #endif
118          return &swap_stat;
119  

Diff Legend

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