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.19 by tdb, Mon Jan 19 16:49:21 2004 UTC vs.
Revision 1.24 by ats, Mon Apr 5 15:40:15 2004 UTC

# Line 35 | Line 35
35   #include <stdio.h>
36   #include <string.h>
37   #endif
38 < #ifdef FREEBSD
38 > #if defined(FREEBSD) || defined(DFBSD)
39   #include <sys/types.h>
40   #include <sys/sysctl.h>
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 57 | Line 62 | mem_stat_t *get_memory_stats(){
62          unsigned long long value;
63          FILE *f;
64   #endif
65 < #ifdef FREEBSD
65 > #if defined(FREEBSD) || defined(DFBSD)
66          int mib[2];
67          u_long physmem;
68          size_t size;
# Line 66 | Line 71 | mem_stat_t *get_memory_stats(){
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
77  
# Line 103 | Line 108 | mem_stat_t *get_memory_stats(){
108                  return NULL;
109          }
110  
111 <        while ((line_ptr = f_read_line(f, "")) != NULL) {
111 >        while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
112                  if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
113                          continue;
114                  }
# Line 122 | Line 127 | mem_stat_t *get_memory_stats(){
127          mem_stat.used = mem_stat.total - mem_stat.free;
128   #endif
129  
130 < #ifdef FREEBSD
130 > #if defined(FREEBSD) || defined(DFBSD)
131          /* Returns bytes */
132          mib[0] = CTL_HW;
133          mib[1] = HW_PHYSMEM;
# Line 165 | Line 170 | mem_stat_t *get_memory_stats(){
170          mem_stat.used=physmem-mem_stat.free;
171   #endif
172  
173 < #ifdef NETBSD
174 <        if ((uvm = get_uvmexp()) == NULL) {
173 > #if defined(NETBSD) || defined(OPENBSD)
174 >        if ((uvm = sg_get_uvmexp()) == NULL) {
175                  return NULL;
176          }
177 +
178          mem_stat.total = uvm->pagesize * uvm->npages;
179 + #ifdef NETBSD
180          mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
181 + #else
182 +        /* Can't find cache memory on OpenBSD */
183 +        mem_stat.cache = 0;
184 + #endif
185          mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
186          mem_stat.used = mem_stat.total - mem_stat.free;
187   #endif

Diff Legend

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