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.11 by ats, Sat Oct 18 23:04:23 2003 UTC vs.
Revision 1.14 by ats, Mon Oct 20 18:13:35 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 54 | Line 54 | mem_stat_t *get_memory_stats(){
54		FILE *f;
55		#endif
56		#ifdef FREEBSD
57	+	int mib[2];
58	+	u_long physmem;
59	+	size_t size;
60		u_int free_count;
61		u_int cache_count;
62		u_int inactive_count;
60	–	u_long physmem;
61	–	size_t size;
63		int pagesize;
64		#endif
65	+	#ifdef NETBSD
66	+	struct uvmexp *uvm;
67	+	#endif
68
69		#ifdef SOLARIS
70		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
#	Line 119 | Line 123 | mem_stat_t *get_memory_stats(){
123
124		#ifdef FREEBSD
125		/* Returns bytes */
126	+	mib[0] = CTL_HW;
127	+	mib[1] = HW_PHYSMEM;
128		size = sizeof physmem;
129	<	if (sysctlbyname("hw.physmem", &physmem, &size, NULL, 0) < 0){
129	>	if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
130		return NULL;
131	<	}
131	>	}
132	>	mem_stat.total = physmem;
133
134		/*returns pages*/
135		size = sizeof free_count;
#	Line 148 | Line 155 | mem_stat_t *get_memory_stats(){
155		return NULL;
156		}
157
151	–	mem_stat.total=physmem;
158		mem_stat.cache=cache_count*pagesize;
159
160		/* Of couse nothing is ever that simple :) And I have inactive pages to
#	Line 158 | Line 164 | mem_stat_t *get_memory_stats(){
164		mem_stat.used=physmem-mem_stat.free;
165		#endif
166
167	<	return &mem_stat;
167	>	#ifdef NETBSD
168	>	if ((uvm = get_uvmexp()) == NULL) {
169	>	return NULL;
170	>	}
171	>	mem_stat.total = uvm->pagesize * uvm->npages;
172	>	mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
173	>	mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
174	>	mem_stat.used = mem_stat.total - mem_stat.free;
175	>	#endif
176
177	+	return &mem_stat;
178		}

Diff Legend

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