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.9 by tdb, Sat Oct 18 12:40:10 2003 UTC vs.
Revision 1.15 by ats, Fri Oct 24 17:03:20 2003 UTC

#	Line 23 | Line 23
23		#endif
24
25		#include "statgrab.h"
26	+	#include "tools.h"
27		#ifdef SOLARIS
28		#include <unistd.h>
29		#include <kstat.h>
#	Line 30 | Line 31
31		#ifdef LINUX
32		#include <stdio.h>
33		#include <string.h>
33	–	#include "tools.h"
34		#endif
35		#ifdef FREEBSD
36		#include <sys/types.h>
#	Line 51 | Line 51 | mem_stat_t *get_memory_stats(){
51		#endif
52		#ifdef LINUX
53		char *line_ptr;
54	+	unsigned long long value;
55		FILE *f;
56		#endif
57		#ifdef FREEBSD
58	+	int mib[2];
59	+	u_long physmem;
60	+	size_t size;
61		u_int free_count;
62		u_int cache_count;
63		u_int inactive_count;
60	–	u_long physmem;
61	–	size_t size;
64		int pagesize;
65		#endif
66	+	#ifdef NETBSD
67	+	struct uvmexp *uvm;
68	+	#endif
69
70		#ifdef SOLARIS
71		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
#	Line 91 | Line 96 | mem_stat_t *get_memory_stats(){
96		#endif
97
98		#ifdef LINUX
99	<	f=fopen("/proc/meminfo", "r");
100	<	if(f==NULL){
99	>	f = fopen("/proc/meminfo", "r");
100	>	if (f == NULL) {
101		return NULL;
102		}
103
104	<	if((line_ptr=f_read_line(f, "Mem:"))==NULL){
105	<	fclose(f);
106	<	return NULL;
107	<	}
104	>	while ((line_ptr = f_read_line(f, "")) != NULL) {
105	>	if (sscanf(line_ptr, "%*s %lld kB", &value) != 2) {
106	>	continue;
107	>	}
108	>	value *= 1024;
109
110	<	fclose(f);
111	<
112	<	/* Linux actually stores this as a unsigned long long, but
113	<	* our structures are just long longs. This shouldn't be a
114	<	* problem for sometime yet :)
115	<	*/
116	<	if((sscanf(line_ptr,"Mem:  %lld %lld %lld %*d %*d %lld", \
111	<	&mem_stat.total, \
112	<	&mem_stat.used, \
113	<	&mem_stat.free, \
114	<	&mem_stat.cache))!=4){
115	<	return NULL;
110	>	if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
111	>	mem_stat.total = value;
112	>	} else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
113	>	mem_stat.free = value;
114	>	} else if (strncmp(line_ptr, "Cached:", 7) == 0) {
115	>	mem_stat.cache = value;
116	>	}
117		}
118
119	+	fclose(f);
120	+	mem_stat.used = mem_stat.total - mem_stat.free;
121		#endif
122
123		#ifdef FREEBSD
124		/* Returns bytes */
125	<	if (sysctlbyname("hw.physmem", NULL, &size, NULL, NULL) < 0){
125	>	mib[0] = CTL_HW;
126	>	mib[1] = HW_PHYSMEM;
127	>	size = sizeof physmem;
128	>	if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
129		return NULL;
130	<	}
131	<	if (sysctlbyname("hw.physmem", &physmem, &size, NULL, NULL) < 0){
126	<	return NULL;
127	<	}
130	>	}
131	>	mem_stat.total = physmem;
132
133		/*returns pages*/
134	<	if (sysctlbyname("vm.stats.vm.v_free_count", NULL, &size, NULL, NULL) < 0){
134	>	size = sizeof free_count;
135	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
136		return NULL;
132	–	}
133	–	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, NULL) < 0){
134	–	return NULL;
137		}
138
139	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", NULL, &size, NULL, NULL) < 0){
139	>	size = sizeof inactive_count;
140	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
141		return NULL;
139	–	}
140	–	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, NULL) < 0){
141	–	return NULL;
142		}
143
144	<	if (sysctlbyname("vm.stats.vm.v_cache_count", NULL, &size, NULL, NULL) < 0){
144	>	size = sizeof cache_count;
145	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
146		return NULL;
146	–	}
147	–	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, NULL) < 0){
148	–	return NULL;
147		}
148
149		/* Because all the vm.stats returns pages, I need to get the page size.
#	Line 156 | Line 154 | mem_stat_t *get_memory_stats(){
154		return NULL;
155		}
156
159	–	mem_stat.total=physmem;
157		mem_stat.cache=cache_count*pagesize;
158
159		/* Of couse nothing is ever that simple :) And I have inactive pages to
#	Line 166 | Line 163 | mem_stat_t *get_memory_stats(){
163		mem_stat.used=physmem-mem_stat.free;
164		#endif
165
166	<	return &mem_stat;
166	>	#ifdef NETBSD
167	>	if ((uvm = get_uvmexp()) == NULL) {
168	>	return NULL;
169	>	}
170	>	mem_stat.total = uvm->pagesize * uvm->npages;
171	>	mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
172	>	mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
173	>	mem_stat.used = mem_stat.total - mem_stat.free;
174	>	#endif
175
176	+	return &mem_stat;
177		}

Diff Legend

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