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.6 by pajs, Thu Apr 3 20:05:10 2003 UTC vs.
Revision 1.14 by ats, Mon Oct 20 18:13:35 2003 UTC

#	Line 1 | Line 1
1		/*
2		* i-scream central monitoring system
3	<	* http://www.i-scream.org.uk
4	<	* Copyright (C) 2000-2002 i-scream
3	>	* http://www.i-scream.org
4	>	* Copyright (C) 2000-2003 i-scream
5		*
6		* This program is free software; you can redistribute it and/or
7		* modify it under the terms of the GNU General Public License
#	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	<	long inactive;
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;
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 115 | Line 122 | mem_stat_t *get_memory_stats(){
122		#endif
123
124		#ifdef FREEBSD
125	<	/* Returns byes */
126	<	if (sysctlbyname("hw.physmem", NULL, &size, NULL, NULL) < 0){
125	>	/* Returns bytes */
126	>	mib[0] = CTL_HW;
127	>	mib[1] = HW_PHYSMEM;
128	>	size = sizeof physmem;
129	>	if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
130		return NULL;
131	<	}
132	<	if (sysctlbyname("hw.physmem", &mem_stat.total, &size, NULL, NULL) < 0){
123	<	return NULL;
124	<	}
131	>	}
132	>	mem_stat.total = physmem;
133
134		/*returns pages*/
135	<	if (sysctlbyname("vm.stats.vm.v_free_count", NULL, &size, NULL, NULL) < 0){
135	>	size = sizeof free_count;
136	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
137		return NULL;
129	–	}
130	–	if (sysctlbyname("vm.stats.vm.v_free_count", &mem_stat.free, &size, NULL, NULL) < 0){
131	–	return NULL;
138		}
139
140	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", NULL, &size, NULL, NULL) < 0){
140	>	size = sizeof inactive_count;
141	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
142		return NULL;
136	–	}
137	–	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive , &size, NULL, NULL) < 0){
138	–	return NULL;
143		}
144
145	<	if (sysctlbyname("vm.stats.vm.v_cache_count", NULL, &size, NULL, NULL) < 0){
145	>	size = sizeof cache_count;
146	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
147		return NULL;
143	–	}
144	–	if (sysctlbyname("vm.stats.vm.v_cache_count", &mem_stat.cache, &size, NULL, NULL) < 0){
145	–	return NULL;
148		}
149
150	<	/* Because all the vm.stats returns pages, i need to get the page size.
151	<	* After that i then need to multiple the anything that used vm.stats to get
152	<	* the system statistics by pagesize
150	>	/* Because all the vm.stats returns pages, I need to get the page size.
151	>	* After that I then need to multiple the anything that used vm.stats to
152	>	* get the system statistics by pagesize
153		*/
154		if ((pagesize=getpagesize()) == -1){
155		return NULL;
156		}
157
158	<	mem_stat.cache=mem_stat.cache*pagesize;
159	<	/* Of couse nothing is ever that simple :) And i have inactive pages to deal
160	<	* with too. So im goingto add them to free memory :)
158	>	mem_stat.cache=cache_count*pagesize;
159	>
160	>	/* Of couse nothing is ever that simple :) And I have inactive pages to
161	>	* deal with too. So I'm going to add them to free memory :)
162		*/
163	<	mem_stat.free=(mem_stat.free*pagesize)+(inactive*pagesize);
164	<
165	<	mem_stat.used=mem_stat.total-mem_stat.free;
163	>	mem_stat.free=(free_count*pagesize)+(inactive_count*pagesize);
164	>	mem_stat.used=physmem-mem_stat.free;
165	>	#endif
166
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;
167	–
178		}

Diff Legend

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