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.21 by tdb, Fri Feb 13 16:46:21 2004 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * i-scream central monitoring system
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
# Line 37 | Line 40
40   #include <sys/sysctl.h>
41   #include <unistd.h>
42   #endif
43 + #if defined(NETBSD) || defined(OPENBSD)
44 + #include <sys/param.h>
45 + #include <uvm/uvm.h>
46 + #endif
47  
48   mem_stat_t *get_memory_stats(){
49  
# Line 49 | Line 56 | mem_stat_t *get_memory_stats(){
56          long totalmem;
57          int pagesize;
58   #endif
59 < #ifdef LINUX
59 > #if defined(LINUX) || defined(CYGWIN)
60          char *line_ptr;
61 +        unsigned long long value;
62          FILE *f;
63   #endif
64   #ifdef FREEBSD
# Line 62 | Line 70 | mem_stat_t *get_memory_stats(){
70          u_int inactive_count;
71          int pagesize;
72   #endif
73 < #ifdef NETBSD
73 > #if defined(NETBSD) || defined(OPENBSD)
74          struct uvmexp *uvm;
75   #endif
76  
# Line 94 | Line 102 | mem_stat_t *get_memory_stats(){
102          mem_stat.used = mem_stat.total - mem_stat.free;
103   #endif
104  
105 < #ifdef LINUX
106 <        f=fopen("/proc/meminfo", "r");
99 <        if(f==NULL){
105 > #if defined(LINUX) || defined(CYGWIN)
106 >        if ((f = fopen("/proc/meminfo", "r")) == NULL) {
107                  return NULL;
108          }
109  
110 <        if((line_ptr=f_read_line(f, "Mem:"))==NULL){
111 <                fclose(f);
112 <                return NULL;
113 <        }
110 >        while ((line_ptr = f_read_line(f, "")) != NULL) {
111 >                if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
112 >                        continue;
113 >                }
114 >                value *= 1024;
115  
116 <        fclose(f);
117 <
118 <        /* Linux actually stores this as a unsigned long long, but
119 <         * our structures are just long longs. This shouldn't be a
120 <         * problem for sometime yet :)
121 <         */
122 <        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;
116 >                if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
117 >                        mem_stat.total = value;
118 >                } else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
119 >                        mem_stat.free = value;
120 >                } else if (strncmp(line_ptr, "Cached:", 7) == 0) {
121 >                        mem_stat.cache = value;
122 >                }
123          }
124  
125 +        fclose(f);
126 +        mem_stat.used = mem_stat.total - mem_stat.free;
127   #endif
128  
129   #ifdef FREEBSD
# Line 164 | Line 169 | mem_stat_t *get_memory_stats(){
169          mem_stat.used=physmem-mem_stat.free;
170   #endif
171  
172 < #ifdef NETBSD
172 > #if defined(NETBSD) || defined(OPENBSD)
173          if ((uvm = get_uvmexp()) == NULL) {
174                  return NULL;
175          }
176 +
177          mem_stat.total = uvm->pagesize * uvm->npages;
178 + #ifdef NETBSD
179          mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
180 + #else
181 +        /* Can't find cache memory on OpenBSD */
182 +        mem_stat.cache = 0;
183 + #endif
184          mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
185          mem_stat.used = mem_stat.total - mem_stat.free;
186   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines