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.23 by tdb, Mon Feb 16 14:55:32 2004 UTC vs.
Revision 1.31 by ats, Sat Nov 6 14:55:53 2004 UTC

# Line 1 | Line 1
1   /*
2 < * i-scream central monitoring system
2 > * i-scream libstatgrab
3   * http://www.i-scream.org
4   * Copyright (C) 2000-2004 i-scream
5   *
# Line 45 | Line 45
45   #include <sys/time.h>
46   #include <uvm/uvm.h>
47   #endif
48 + #ifdef HPUX
49 + #include <sys/param.h>
50 + #include <sys/pstat.h>
51 + #include <unistd.h>
52 + #endif
53  
54 < mem_stat_t *get_memory_stats(){
54 > sg_mem_stats *sg_get_mem_stats(){
55  
56 <        static mem_stat_t mem_stat;
56 >        static sg_mem_stats mem_stat;
57  
58 + #ifdef HPUX
59 +        struct pst_static *pstat_static;
60 +        struct pst_dynamic pstat_dynamic;
61 +        long long pagesize;
62 + #endif
63   #ifdef SOLARIS
64          kstat_ctl_t *kc;
65          kstat_t *ksp;
# Line 75 | Line 85 | mem_stat_t *get_memory_stats(){
85          struct uvmexp *uvm;
86   #endif
87  
88 + #ifdef HPUX
89 +        if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
90 +                sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
91 +                return NULL;
92 +        }
93 +
94 +        if (pstat_getdynamic(&pstat_dynamic, sizeof(pstat_dynamic), 1, 0) == -1) {
95 +                sg_set_error_with_errno(SG_ERROR_PSTAT, "pstat_dynamic");
96 +                return NULL;
97 +        }
98 +        pstat_static = sg_get_pstat_static();
99 +        if (pstat_static == NULL) {
100 +                return NULL;
101 +        }
102 +
103 +        /* FIXME Does this include swap? */
104 +        mem_stat.total = ((long long) pstat_static->physical_memory) * pagesize;
105 +        mem_stat.free = ((long long) pstat_dynamic.psd_free) * pagesize;
106 +        mem_stat.used = mem_stat.total - mem_stat.free;
107 + #endif
108   #ifdef SOLARIS
109          if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
110 +                sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
111                  return NULL;    
112          }
113  
114          if((totalmem=sysconf(_SC_PHYS_PAGES)) == -1){
115 +                sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PHYS_PAGES");
116                  return NULL;
117          }
118  
119          if ((kc = kstat_open()) == NULL) {
120 +                sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
121                  return NULL;
122          }
123          if((ksp=kstat_lookup(kc, "unix", 0, "system_pages")) == NULL){
124 +                sg_set_error(SG_ERROR_KSTAT_LOOKUP, "unix,0,system_pages");
125                  return NULL;
126          }
127          if (kstat_read(kc, ksp, 0) == -1) {
128 +                sg_set_error(SG_ERROR_KSTAT_READ, NULL);
129                  return NULL;
130          }
131          if((kn=kstat_data_lookup(ksp, "freemem")) == NULL){
132 +                sg_set_error(SG_ERROR_KSTAT_DATA_LOOKUP, "freemem");
133                  return NULL;
134          }
135 <        kstat_close(kc);
135 >        kstat_close(kc);
136  
137          mem_stat.total = (long long)totalmem * (long long)pagesize;
138          mem_stat.free = ((long long)kn->value.ul) * (long long)pagesize;
# Line 105 | Line 141 | mem_stat_t *get_memory_stats(){
141  
142   #if defined(LINUX) || defined(CYGWIN)
143          if ((f = fopen("/proc/meminfo", "r")) == NULL) {
144 +                sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/meminfo");
145                  return NULL;
146          }
147  
148 <        while ((line_ptr = f_read_line(f, "")) != NULL) {
148 >        while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
149                  if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
150                          continue;
151                  }
# Line 133 | Line 170 | mem_stat_t *get_memory_stats(){
170          mib[1] = HW_PHYSMEM;
171          size = sizeof physmem;
172          if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
173 +                sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_PHYSMEM");
174                  return NULL;
175          }
176          mem_stat.total = physmem;
177  
178          /*returns pages*/
179          size = sizeof free_count;
180 <        if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
180 >        if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
181 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
182 >                                        "vm.stats.vm.v_free_count");
183                  return NULL;
184 <        }
184 >        }
185  
186          size = sizeof inactive_count;
187 <        if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
187 >        if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
188 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
189 >                                        "vm.stats.vm.v_inactive_count");
190                  return NULL;
191 <        }
191 >        }
192  
193          size = sizeof cache_count;
194 <        if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
194 >        if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
195 >                sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
196 >                                        "vm.stats.vm.v_cache_count");
197                  return NULL;
198 <        }
198 >        }
199  
200          /* Because all the vm.stats returns pages, I need to get the page size.
201 <         * After that I then need to multiple the anything that used vm.stats to
201 >         * After that I then need to multiple the anything that used vm.stats to
202           * get the system statistics by pagesize
203           */
204 <        if ((pagesize=getpagesize()) == -1){
161 <                return NULL;
162 <        }
163 <
204 >        pagesize = getpagesize();
205          mem_stat.cache=cache_count*pagesize;
206  
207          /* Of couse nothing is ever that simple :) And I have inactive pages to
# Line 171 | Line 212 | mem_stat_t *get_memory_stats(){
212   #endif
213  
214   #if defined(NETBSD) || defined(OPENBSD)
215 <        if ((uvm = get_uvmexp()) == NULL) {
215 >        if ((uvm = sg_get_uvmexp()) == NULL) {
216                  return NULL;
217          }
218  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines