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.24 by ats, Mon Apr 5 15:40:15 2004 UTC vs.
Revision 1.28 by ats, Sun Jul 18 21:30:11 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 77 | Line 77 | sg_mem_stats *sg_get_mem_stats(){
77
78		#ifdef SOLARIS
79		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
80	+	sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PAGESIZE");
81		return NULL;
82		}
83
84		if((totalmem=sysconf(_SC_PHYS_PAGES)) == -1){
85	+	sg_set_error_with_errno(SG_ERROR_SYSCONF, "_SC_PHYS_PAGES");
86		return NULL;
87		}
88
89		if ((kc = kstat_open()) == NULL) {
90	+	sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
91		return NULL;
92		}
93		if((ksp=kstat_lookup(kc, "unix", 0, "system_pages")) == NULL){
94	+	sg_set_error(SG_ERROR_KSTAT_LOOKUP, "unix,0,system_pages");
95		return NULL;
96		}
97		if (kstat_read(kc, ksp, 0) == -1) {
98	+	sg_set_error(SG_ERROR_KSTAT_READ, NULL);
99		return NULL;
100		}
101		if((kn=kstat_data_lookup(ksp, "freemem")) == NULL){
102	+	sg_set_error(SG_ERROR_KSTAT_DATA_LOOKUP, "freemem");
103		return NULL;
104		}
105	<	kstat_close(kc);
105	>	kstat_close(kc);
106
107		mem_stat.total = (long long)totalmem * (long long)pagesize;
108		mem_stat.free = ((long long)kn->value.ul) * (long long)pagesize;
#	Line 105 | Line 111 | sg_mem_stats *sg_get_mem_stats(){
111
112		#if defined(LINUX) || defined(CYGWIN)
113		if ((f = fopen("/proc/meminfo", "r")) == NULL) {
114	+	sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/meminfo");
115		return NULL;
116		}
117
#	Line 133 | Line 140 | sg_mem_stats *sg_get_mem_stats(){
140		mib[1] = HW_PHYSMEM;
141		size = sizeof physmem;
142		if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
143	+	sg_set_error_with_errno(SG_ERROR_SYSCTL, "CTL_HW.HW_PHYSMEM");
144		return NULL;
145		}
146		mem_stat.total = physmem;
147
148		/*returns pages*/
149		size = sizeof free_count;
150	<	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
150	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
151	>	sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
152	>	"vm.stats.vm.v_free_count");
153		return NULL;
154	<	}
154	>	}
155
156		size = sizeof inactive_count;
157	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
157	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
158	>	sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
159	>	"vm.stats.vm.v_inactive_count");
160		return NULL;
161	<	}
161	>	}
162
163		size = sizeof cache_count;
164	<	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
164	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
165	>	sg_set_error_with_errno(SG_ERROR_SYSCTLBYNAME,
166	>	"vm.stats.vm.v_cache_count");
167		return NULL;
168	<	}
168	>	}
169
170		/* Because all the vm.stats returns pages, I need to get the page size.
171	<	* After that I then need to multiple the anything that used vm.stats to
171	>	* After that I then need to multiple the anything that used vm.stats to
172		* get the system statistics by pagesize
173		*/
174	+	/* FIXME getpagesize() cannot actually fail */
175		if ((pagesize=getpagesize()) == -1){
176	+	sg_set_error(SG_ERROR_GETPAGESIZE, "NULL");
177		return NULL;
178		}
179

Diff Legend

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