ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/memory_stats.c

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.30 by tdb, Mon Nov 1 18:30:17 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	+	if (pstat_getstatic(&pstat_static, sizeof(pstat_static), 1, 0) == -1) {
99	+	sg_set_error_with_errno(SG_ERROR_PSTAT, "pstat_static");
100	+	return NULL;
101	+	}
102	+
103	+	mem_stat.total = ((long long) pstat_static.physical_memory) * pagesize;
104	+	mem_stat.free = ((long long) pstat_dynamic.psd_free) * pagesize;
105	+	mem_stat.used = mem_stat.total - mem_stat.free;
106	+	#endif
107		#ifdef SOLARIS
108		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
109	+	sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
110		return NULL;
111		}
112
113		if((totalmem=sysconf(_SC_PHYS_PAGES)) == -1){
114	+	sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PHYS_PAGES");
115		return NULL;
116		}
117
118		if ((kc = kstat_open()) == NULL) {
119	+	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
120		return NULL;
121		}
122		if((ksp=kstat_lookup(kc, "unix", 0, "system_pages")) == NULL){
123	+	sg_set_error(SG_ERROR_KSTAT_LOOKUP, "unix,0,system_pages");
124		return NULL;
125		}
126		if (kstat_read(kc, ksp, 0) == -1) {
127	+	sg_set_error(SG_ERROR_KSTAT_READ, NULL);
128		return NULL;
129		}
130		if((kn=kstat_data_lookup(ksp, "freemem")) == NULL){
131	+	sg_set_error(SG_ERROR_KSTAT_DATA_LOOKUP, "freemem");
132		return NULL;
133		}
134	<	kstat_close(kc);
134	>	kstat_close(kc);
135
136		mem_stat.total = (long long)totalmem * (long long)pagesize;
137		mem_stat.free = ((long long)kn->value.ul) * (long long)pagesize;
#	Line 105 | Line 140 | mem_stat_t *get_memory_stats(){
140
141		#if defined(LINUX) || defined(CYGWIN)
142		if ((f = fopen("/proc/meminfo", "r")) == NULL) {
143	+	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/meminfo");
144		return NULL;
145		}
146
147	<	while ((line_ptr = f_read_line(f, "")) != NULL) {
147	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
148		if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
149		continue;
150		}
#	Line 133 | Line 169 | mem_stat_t *get_memory_stats(){
169		mib[1] = HW_PHYSMEM;
170		size = sizeof physmem;
171		if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
172	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_PHYSMEM");
173		return NULL;
174		}
175		mem_stat.total = physmem;
176
177		/*returns pages*/
178		size = sizeof free_count;
179	<	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
179	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
180	>	sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
181	>	"vm.stats.vm.v_free_count");
182		return NULL;
183	<	}
183	>	}
184
185		size = sizeof inactive_count;
186	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
186	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
187	>	sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
188	>	"vm.stats.vm.v_inactive_count");
189		return NULL;
190	<	}
190	>	}
191
192		size = sizeof cache_count;
193	<	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
193	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
194	>	sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
195	>	"vm.stats.vm.v_cache_count");
196		return NULL;
197	<	}
197	>	}
198
199		/* Because all the vm.stats returns pages, I need to get the page size.
200	<	* After that I then need to multiple the anything that used vm.stats to
200	>	* After that I then need to multiple the anything that used vm.stats to
201		* get the system statistics by pagesize
202		*/
203	<	if ((pagesize=getpagesize()) == -1){
161	<	return NULL;
162	<	}
163	<
203	>	pagesize = getpagesize();
204		mem_stat.cache=cache_count*pagesize;
205
206		/* Of couse nothing is ever that simple :) And I have inactive pages to
#	Line 171 | Line 211 | mem_stat_t *get_memory_stats(){
211		#endif
212
213		#if defined(NETBSD) || defined(OPENBSD)
214	<	if ((uvm = get_uvmexp()) == NULL) {
214	>	if ((uvm = sg_get_uvmexp()) == NULL) {
215		return NULL;
216		}
217

Diff Legend

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