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.18 by tdb, Fri Jan 16 15:54:54 2004 UTC vs.
Revision 1.23 by tdb, Mon Feb 16 14:55:32 2004 UTC

#	Line 17 | Line 17
17		* License along with this library; if not, write to the Free Software
18		* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19		* 02111-1307 USA
20	+	*
21	+	* $Id$
22		*/
23
24		#ifdef HAVE_CONFIG_H
#	Line 33 | Line 35
35		#include <stdio.h>
36		#include <string.h>
37		#endif
38	<	#ifdef FREEBSD
38	>	#if defined(FREEBSD) || defined(DFBSD)
39		#include <sys/types.h>
40		#include <sys/sysctl.h>
41		#include <unistd.h>
42		#endif
43	+	#if defined(NETBSD) || defined(OPENBSD)
44	+	#include <sys/param.h>
45	+	#include <sys/time.h>
46	+	#include <uvm/uvm.h>
47	+	#endif
48
49		mem_stat_t *get_memory_stats(){
50
#	Line 55 | Line 62 | mem_stat_t *get_memory_stats(){
62		unsigned long long value;
63		FILE *f;
64		#endif
65	<	#ifdef FREEBSD
65	>	#if defined(FREEBSD) || defined(DFBSD)
66		int mib[2];
67		u_long physmem;
68		size_t size;
#	Line 64 | Line 71 | mem_stat_t *get_memory_stats(){
71		u_int inactive_count;
72		int pagesize;
73		#endif
74	<	#ifdef NETBSD
74	>	#if defined(NETBSD) || defined(OPENBSD)
75		struct uvmexp *uvm;
76		#endif
77
#	Line 120 | Line 127 | mem_stat_t *get_memory_stats(){
127		mem_stat.used = mem_stat.total - mem_stat.free;
128		#endif
129
130	<	#ifdef FREEBSD
130	>	#if defined(FREEBSD) || defined(DFBSD)
131		/* Returns bytes */
132		mib[0] = CTL_HW;
133		mib[1] = HW_PHYSMEM;
#	Line 163 | Line 170 | mem_stat_t *get_memory_stats(){
170		mem_stat.used=physmem-mem_stat.free;
171		#endif
172
173	<	#ifdef NETBSD
173	>	#if defined(NETBSD) || defined(OPENBSD)
174		if ((uvm = get_uvmexp()) == NULL) {
175		return NULL;
176		}
177	+
178		mem_stat.total = uvm->pagesize * uvm->npages;
179	+	#ifdef NETBSD
180		mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
181	+	#else
182	+	/* Can't find cache memory on OpenBSD */
183	+	mem_stat.cache = 0;
184	+	#endif
185		mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
186		mem_stat.used = mem_stat.total - mem_stat.free;
187		#endif

Diff Legend

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