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.13 by ats, Sun Oct 19 02:11:50 2003 UTC vs.
Revision 1.29 by ats, Sun Jul 18 21:31:32 2004 UTC

# Line 1 | Line 1
1 < /*
2 < * i-scream central monitoring system
1 > /*
2 > * i-scream libstatgrab
3   * http://www.i-scream.org
4 < * Copyright (C) 2000-2003 i-scream
4 > * Copyright (C) 2000-2004 i-scream
5   *
6 < * This program is free software; you can redistribute it and/or
7 < * modify it under the terms of the GNU General Public License
8 < * as published by the Free Software Foundation; either version 2
9 < * of the License, or (at your option) any later version.
6 > * This library is free software; you can redistribute it and/or
7 > * modify it under the terms of the GNU Lesser General Public
8 > * License as published by the Free Software Foundation; either
9 > * version 2.1 of the License, or (at your option) any later version.
10   *
11 < * This program is distributed in the hope that it will be useful,
11 > * This library is distributed in the hope that it will be useful,
12   * but WITHOUT ANY WARRANTY; without even the implied warranty of
13 < * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14 < * GNU General Public License for more details.
13 > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14 > * Lesser General Public License for more details.
15   *
16 < * You should have received a copy of the GNU General Public License
17 < * along with this program; if not, write to the Free Software
18 < * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16 > * You should have received a copy of the GNU Lesser General Public
17 > * License along with this library; if not, write to the Free Software
18 > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19 > * 02111-1307 USA
20 > *
21 > * $Id$
22   */
23  
24   #ifdef HAVE_CONFIG_H
# Line 28 | Line 31
31   #include <unistd.h>
32   #include <kstat.h>
33   #endif
34 < #ifdef LINUX
34 > #if defined(LINUX) || defined(CYGWIN)
35   #include <stdio.h>
36   #include <string.h>
37   #endif
38 < #ifdef ALLBSD
36 < #ifdef FREEBSD
38 > #if defined(FREEBSD) || defined(DFBSD)
39   #include <sys/types.h>
40   #include <sys/sysctl.h>
39 #else
40 #include <sys/param.h>
41 #include <sys/sysctl.h>
42 #endif
41   #include <unistd.h>
42   #endif
43 + #if defined(NETBSD) || defined(OPENBSD)
44 + #include <sys/param.h>
45 + #include <sys/time.h>
46 + #include <uvm/uvm.h>
47 + #endif
48  
49 < mem_stat_t *get_memory_stats(){
49 > sg_mem_stats *sg_get_mem_stats(){
50  
51 <        static mem_stat_t mem_stat;
51 >        static sg_mem_stats mem_stat;
52  
53   #ifdef SOLARIS
54          kstat_ctl_t *kc;
# Line 54 | Line 57 | mem_stat_t *get_memory_stats(){
57          long totalmem;
58          int pagesize;
59   #endif
60 < #ifdef LINUX
60 > #if defined(LINUX) || defined(CYGWIN)
61          char *line_ptr;
62 +        unsigned long long value;
63          FILE *f;
64   #endif
65 < #ifdef ALLBSD
65 > #if defined(FREEBSD) || defined(DFBSD)
66          int mib[2];
67 < #ifdef FREEBSD
67 >        u_long physmem;
68 >        size_t size;
69          u_int free_count;
70          u_int cache_count;
71          u_int inactive_count;
72          int pagesize;
73   #endif
74 < #ifdef NETBSD
74 > #if defined(NETBSD) || defined(OPENBSD)
75          struct uvmexp *uvm;
76   #endif
72        u_long physmem;
73        size_t size;
74 #endif
77  
78   #ifdef SOLARIS
79          if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
80 +                sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
81                  return NULL;    
82          }
83  
84          if((totalmem=sysconf(_SC_PHYS_PAGES)) == -1){
85 +                sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PHYS_PAGES");
86                  return NULL;
87          }
88  
89          if ((kc = kstat_open()) == NULL) {
90 +                sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
91                  return NULL;
92          }
93          if((ksp=kstat_lookup(kc, "unix", 0, "system_pages")) == NULL){
94 +                sg_set_error(SG_ERROR_KSTAT_LOOKUP, "unix,0,system_pages");
95                  return NULL;
96          }
97          if (kstat_read(kc, ksp, 0) == -1) {
98 +                sg_set_error(SG_ERROR_KSTAT_READ, NULL);
99                  return NULL;
100          }
101          if((kn=kstat_data_lookup(ksp, "freemem")) == NULL){
102 +                sg_set_error(SG_ERROR_KSTAT_DATA_LOOKUP, "freemem");
103                  return NULL;
104          }
105 <        kstat_close(kc);
105 >        kstat_close(kc);
106  
107          mem_stat.total = (long long)totalmem * (long long)pagesize;
108          mem_stat.free = ((long long)kn->value.ul) * (long long)pagesize;
109          mem_stat.used = mem_stat.total - mem_stat.free;
110   #endif
111  
112 < #ifdef LINUX
113 <        f=fopen("/proc/meminfo", "r");
114 <        if(f==NULL){
112 > #if defined(LINUX) || defined(CYGWIN)
113 >        if ((f = fopen("/proc/meminfo", "r")) == NULL) {
114 >                sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/meminfo");
115                  return NULL;
116          }
117  
118 <        if((line_ptr=f_read_line(f, "Mem:"))==NULL){
119 <                fclose(f);
120 <                return NULL;
121 <        }
118 >        while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
119 >                if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
120 >                        continue;
121 >                }
122 >                value *= 1024;
123  
124 <        fclose(f);
125 <
126 <        /* Linux actually stores this as a unsigned long long, but
127 <         * our structures are just long longs. This shouldn't be a
128 <         * problem for sometime yet :)
129 <         */
130 <        if((sscanf(line_ptr,"Mem:  %lld %lld %lld %*d %*d %lld", \
122 <                &mem_stat.total, \
123 <                &mem_stat.used, \
124 <                &mem_stat.free, \
125 <                &mem_stat.cache))!=4){
126 <                        return NULL;
124 >                if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
125 >                        mem_stat.total = value;
126 >                } else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
127 >                        mem_stat.free = value;
128 >                } else if (strncmp(line_ptr, "Cached:", 7) == 0) {
129 >                        mem_stat.cache = value;
130 >                }
131          }
132  
133 +        fclose(f);
134 +        mem_stat.used = mem_stat.total - mem_stat.free;
135   #endif
136  
137 < #ifdef ALLBSD
137 > #if defined(FREEBSD) || defined(DFBSD)
138          /* Returns bytes */
139          mib[0] = CTL_HW;
140          mib[1] = HW_PHYSMEM;
141          size = sizeof physmem;
142          if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
143 +                sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_PHYSMEM");
144                  return NULL;
145          }
146          mem_stat.total = physmem;
147  
148          /*returns pages*/
142 #ifdef FREEBSD
149          size = sizeof free_count;
150 <        if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
150 >        if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
151 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
152 >                                        "vm.stats.vm.v_free_count");
153                  return NULL;
154 <        }
154 >        }
155  
156          size = sizeof inactive_count;
157 <        if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
157 >        if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
158 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
159 >                                        "vm.stats.vm.v_inactive_count");
160                  return NULL;
161 <        }
161 >        }
162  
163          size = sizeof cache_count;
164 <        if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
164 >        if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
165 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
166 >                                        "vm.stats.vm.v_cache_count");
167                  return NULL;
168 <        }
168 >        }
169  
170          /* Because all the vm.stats returns pages, I need to get the page size.
171 <         * After that I then need to multiple the anything that used vm.stats to
171 >         * After that I then need to multiple the anything that used vm.stats to
172           * get the system statistics by pagesize
173           */
174 <        if ((pagesize=getpagesize()) == -1){
163 <                return NULL;
164 <        }
165 <
174 >        pagesize = getpagesize();
175          mem_stat.cache=cache_count*pagesize;
176  
177          /* Of couse nothing is ever that simple :) And I have inactive pages to
# Line 171 | Line 180 | mem_stat_t *get_memory_stats(){
180          mem_stat.free=(free_count*pagesize)+(inactive_count*pagesize);
181          mem_stat.used=physmem-mem_stat.free;
182   #endif
183 < #ifdef NETBSD
184 <        /* FIXME This is not consistent with the FreeBSD logic above. */
185 <        if ((uvm = get_uvmexp()) == NULL) {
183 >
184 > #if defined(NETBSD) || defined(OPENBSD)
185 >        if ((uvm = sg_get_uvmexp()) == NULL) {
186                  return NULL;
187          }
188 +
189 +        mem_stat.total = uvm->pagesize * uvm->npages;
190 + #ifdef NETBSD
191          mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
192 <        mem_stat.free = uvm->pagesize * uvm->free;
193 <        mem_stat.used = uvm->pagesize * (uvm->npages - uvm->free);
192 > #else
193 >        /* Can't find cache memory on OpenBSD */
194 >        mem_stat.cache = 0;
195   #endif
196 +        mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
197 +        mem_stat.used = mem_stat.total - mem_stat.free;
198   #endif
199  
200          return &mem_stat;
186
201   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines