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.17 by ats, Mon Nov 10 23:25:45 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>
30		#endif
31	<	#ifdef LINUX
31	>	#if defined(LINUX) || defined(CYGWIN)
32		#include <stdio.h>
33		#include <string.h>
33	–	#include "tools.h"
34		#endif
35		#ifdef FREEBSD
36		#include <sys/types.h>
#	Line 49 | Line 49 | mem_stat_t *get_memory_stats(){
49		long totalmem;
50		int pagesize;
51		#endif
52	<	#ifdef LINUX
52	>	#if defined(LINUX) || defined(CYGWIN)
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 90 | Line 95 | mem_stat_t *get_memory_stats(){
95		mem_stat.used = mem_stat.total - mem_stat.free;
96		#endif
97
98	<	#ifdef LINUX
99	<	f=fopen("/proc/meminfo", "r");
95	<	if(f==NULL){
98	>	#if defined(LINUX) || defined(CYGWIN)
99	>	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
100		return NULL;
101		}
102
103	<	if((line_ptr=f_read_line(f, "Mem:"))==NULL){
104	<	fclose(f);
105	<	return NULL;
106	<	}
103	>	while ((line_ptr = f_read_line(f, "")) != NULL) {
104	>	if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
105	>	continue;
106	>	}
107	>	value *= 1024;
108
109	<	fclose(f);
110	<
111	<	/* Linux actually stores this as a unsigned long long, but
112	<	* our structures are just long longs. This shouldn't be a
113	<	* problem for sometime yet :)
114	<	*/
115	<	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;
109	>	if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
110	>	mem_stat.total = value;
111	>	} else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
112	>	mem_stat.free = value;
113	>	} else if (strncmp(line_ptr, "Cached:", 7) == 0) {
114	>	mem_stat.cache = value;
115	>	}
116		}
117
118	+	fclose(f);
119	+	mem_stat.used = mem_stat.total - mem_stat.free;
120		#endif
121
122		#ifdef FREEBSD
123		/* Returns bytes */
124	<	if (sysctlbyname("hw.physmem", NULL, &size, NULL, NULL) < 0){
124	>	mib[0] = CTL_HW;
125	>	mib[1] = HW_PHYSMEM;
126	>	size = sizeof physmem;
127	>	if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
128		return NULL;
129	<	}
130	<	if (sysctlbyname("hw.physmem", &physmem, &size, NULL, NULL) < 0){
126	<	return NULL;
127	<	}
129	>	}
130	>	mem_stat.total = physmem;
131
132		/*returns pages*/
133	<	if (sysctlbyname("vm.stats.vm.v_free_count", NULL, &size, NULL, NULL) < 0){
133	>	size = sizeof free_count;
134	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
135		return NULL;
132	–	}
133	–	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, NULL) < 0){
134	–	return NULL;
136		}
137
138	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", NULL, &size, NULL, NULL) < 0){
138	>	size = sizeof inactive_count;
139	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
140		return NULL;
139	–	}
140	–	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, NULL) < 0){
141	–	return NULL;
141		}
142
143	<	if (sysctlbyname("vm.stats.vm.v_cache_count", NULL, &size, NULL, NULL) < 0){
143	>	size = sizeof cache_count;
144	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
145		return NULL;
146	–	}
147	–	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, NULL) < 0){
148	–	return NULL;
146		}
147
148		/* Because all the vm.stats returns pages, I need to get the page size.
#	Line 156 | Line 153 | mem_stat_t *get_memory_stats(){
153		return NULL;
154		}
155
159	–	mem_stat.total=physmem;
156		mem_stat.cache=cache_count*pagesize;
157
158		/* Of couse nothing is ever that simple :) And I have inactive pages to
#	Line 166 | Line 162 | mem_stat_t *get_memory_stats(){
162		mem_stat.used=physmem-mem_stat.free;
163		#endif
164
165	<	return &mem_stat;
165	>	#ifdef NETBSD
166	>	if ((uvm = get_uvmexp()) == NULL) {
167	>	return NULL;
168	>	}
169	>	mem_stat.total = uvm->pagesize * uvm->npages;
170	>	mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
171	>	mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
172	>	mem_stat.used = mem_stat.total - mem_stat.free;
173	>	#endif
174
175	+	return &mem_stat;
176		}

Diff Legend

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