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.30 by tdb, Mon Nov 1 18:30:17 2004 UTC vs.
Revision 1.32 by tdb, Sat Sep 24 13:29:22 2005 UTC

# Line 50 | Line 50
50   #include <sys/pstat.h>
51   #include <unistd.h>
52   #endif
53 + #ifdef WIN32
54 + #include <windows.h>
55 + #include "win32.h"
56 + #endif
57  
58   sg_mem_stats *sg_get_mem_stats(){
59  
60          static sg_mem_stats mem_stat;
61  
62   #ifdef HPUX
63 <        struct pst_static pstat_static;
63 >        struct pst_static *pstat_static;
64          struct pst_dynamic pstat_dynamic;
65          long long pagesize;
66   #endif
# Line 84 | Line 88 | sg_mem_stats *sg_get_mem_stats(){
88   #if defined(NETBSD) || defined(OPENBSD)
89          struct uvmexp *uvm;
90   #endif
91 + #ifdef WIN32
92 +        MEMORYSTATUSEX memstats;
93 + #endif
94  
95   #ifdef HPUX
96          if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
# Line 95 | Line 102 | sg_mem_stats *sg_get_mem_stats(){
102                  sg_set_error_with_errno(SG_ERROR_PSTAT, "pstat_dynamic");
103                  return NULL;
104          }
105 <        if (pstat_getstatic(&pstat_static, sizeof(pstat_static), 1, 0) == -1) {
106 <                sg_set_error_with_errno(SG_ERROR_PSTAT, "pstat_static");
105 >        pstat_static = sg_get_pstat_static();
106 >        if (pstat_static == NULL) {
107                  return NULL;
108          }
109  
110 <        mem_stat.total = ((long long) pstat_static.physical_memory) * pagesize;
110 >        /* FIXME Does this include swap? */
111 >        mem_stat.total = ((long long) pstat_static->physical_memory) * pagesize;
112          mem_stat.free = ((long long) pstat_dynamic.psd_free) * pagesize;
113          mem_stat.used = mem_stat.total - mem_stat.free;
114   #endif
# Line 226 | Line 234 | sg_mem_stats *sg_get_mem_stats(){
234          mem_stat.used = mem_stat.total - mem_stat.free;
235   #endif
236  
237 + #ifdef WIN32
238 +        memstats.dwLength = sizeof(memstats);
239 +        if (!GlobalMemoryStatusEx(&memstats)) {
240 +                sg_set_error_with_errno(SG_ERROR_MEMSTATUS, NULL);
241 +                return NULL;
242 +        }
243 +        mem_stat.free = memstats.ullAvailPhys;
244 +        mem_stat.total = memstats.ullTotalPhys;
245 +        mem_stat.used = mem_stat.total - mem_stat.free;
246 +        if(read_counter_large(SG_WIN32_MEM_CACHE, &mem_stat.cache)) {
247 +                mem_stat.cache = 0;
248 +        }
249 + #endif
250          return &mem_stat;
251   }

Diff Legend

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