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.8 by tdb, Sat Oct 18 12:28:32 2003 UTC vs.
Revision 1.20 by tdb, Thu Feb 12 23:04:52 2004 UTC

#	Line 1 | Line 1
1	<	/*
1	>	/*
2		* i-scream central monitoring system
3		* http://www.i-scream.org
4	<	* Copyright (C) 2000-2003 i-scream
4	>	* Copyright (C) 2000-2004 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
8	<	* as published by the Free Software Foundation; either version 2
9	<	* of the License, or (at your option) any later version.
6	>	* This library is free software; you can redistribute it and/or
7	>	* modify it under the terms of the GNU Lesser General Public
8	>	* License as published by the Free Software Foundation; either
9	>	* version 2.1 of the License, or (at your option) any later version.
10		*
11	<	* This program is distributed in the hope that it will be useful,
11	>	* This library is distributed in the hope that it will be useful,
12		* but WITHOUT ANY WARRANTY; without even the implied warranty of
13	<	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
14	<	* GNU General Public License for more details.
13	>	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14	>	* Lesser General Public License for more details.
15		*
16	<	* You should have received a copy of the GNU General Public License
17	<	* along with this program; if not, write to the Free Software
18	<	* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
16	>	* You should have received a copy of the GNU Lesser General Public
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 23 | Line 26
26		#endif
27
28		#include "statgrab.h"
29	+	#include "tools.h"
30		#ifdef SOLARIS
31		#include <unistd.h>
32		#include <kstat.h>
33		#endif
34	<	#ifdef LINUX
34	>	#if defined(LINUX) || defined(CYGWIN)
35		#include <stdio.h>
36		#include <string.h>
33	–	#include "tools.h"
37		#endif
38		#ifdef FREEBSD
39		#include <sys/types.h>
40		#include <sys/sysctl.h>
41		#include <unistd.h>
42		#endif
43	+	#ifdef OPENBSD
44	+	#include <stdlib.h>
45	+	#include <sys/param.h>
46	+	#include <sys/sysctl.h>
47	+	#include <uvm/uvm.h>
48	+	#endif
49
50		mem_stat_t *get_memory_stats(){
51
#	Line 49 | Line 58 | mem_stat_t *get_memory_stats(){
58		long totalmem;
59		int pagesize;
60		#endif
61	<	#ifdef LINUX
61	>	#if defined(LINUX) || defined(CYGWIN)
62		char *line_ptr;
63	+	unsigned long long value;
64		FILE *f;
65		#endif
66		#ifdef FREEBSD
67	+	int mib[2];
68	+	u_long physmem;
69	+	size_t size;
70		u_int free_count;
71		u_int cache_count;
72		u_int inactive_count;
60	–	u_int physmem;
61	–	size_t size;
73		int pagesize;
74		#endif
75	+	#if defined(NETBSD) || defined(OPENBSD)
76	+	struct uvmexp *uvm;
77	+	#endif
78	+	#ifdef OPENBSD
79	+	int mib[2];
80	+	size_t size;
81	+	#endif
82
83		#ifdef SOLARIS
84		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
#	Line 90 | Line 108 | mem_stat_t *get_memory_stats(){
108		mem_stat.used = mem_stat.total - mem_stat.free;
109		#endif
110
111	<	#ifdef LINUX
112	<	f=fopen("/proc/meminfo", "r");
95	<	if(f==NULL){
111	>	#if defined(LINUX) || defined(CYGWIN)
112	>	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
113		return NULL;
114		}
115
116	<	if((line_ptr=f_read_line(f, "Mem:"))==NULL){
117	<	fclose(f);
118	<	return NULL;
119	<	}
116	>	while ((line_ptr = f_read_line(f, "")) != NULL) {
117	>	if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
118	>	continue;
119	>	}
120	>	value *= 1024;
121
122	<	fclose(f);
123	<
124	<	/* Linux actually stores this as a unsigned long long, but
125	<	* our structures are just long longs. This shouldn't be a
126	<	* problem for sometime yet :)
127	<	*/
128	<	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;
122	>	if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
123	>	mem_stat.total = value;
124	>	} else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
125	>	mem_stat.free = value;
126	>	} else if (strncmp(line_ptr, "Cached:", 7) == 0) {
127	>	mem_stat.cache = value;
128	>	}
129		}
130
131	+	fclose(f);
132	+	mem_stat.used = mem_stat.total - mem_stat.free;
133		#endif
134
135		#ifdef FREEBSD
136		/* Returns bytes */
137	<	if (sysctlbyname("hw.physmem", NULL, &size, NULL, NULL) < 0){
137	>	mib[0] = CTL_HW;
138	>	mib[1] = HW_PHYSMEM;
139	>	size = sizeof physmem;
140	>	if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
141		return NULL;
142	<	}
143	<	if (sysctlbyname("hw.physmem", &physmem, &size, NULL, NULL) < 0){
126	<	return NULL;
127	<	}
142	>	}
143	>	mem_stat.total = physmem;
144
145		/*returns pages*/
146	<	if (sysctlbyname("vm.stats.vm.v_free_count", NULL, &size, NULL, NULL) < 0){
146	>	size = sizeof free_count;
147	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
148		return NULL;
132	–	}
133	–	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, NULL) < 0){
134	–	return NULL;
149		}
150
151	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", NULL, &size, NULL, NULL) < 0){
151	>	size = sizeof inactive_count;
152	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
153		return NULL;
139	–	}
140	–	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, NULL) < 0){
141	–	return NULL;
154		}
155
156	<	if (sysctlbyname("vm.stats.vm.v_cache_count", NULL, &size, NULL, NULL) < 0){
156	>	size = sizeof cache_count;
157	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
158		return NULL;
146	–	}
147	–	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, NULL) < 0){
148	–	return NULL;
159		}
160
161		/* Because all the vm.stats returns pages, I need to get the page size.
#	Line 156 | Line 166 | mem_stat_t *get_memory_stats(){
166		return NULL;
167		}
168
159	–	mem_stat.total=physmem;
169		mem_stat.cache=cache_count*pagesize;
170
171		/* Of couse nothing is ever that simple :) And I have inactive pages to
#	Line 166 | Line 175 | mem_stat_t *get_memory_stats(){
175		mem_stat.used=physmem-mem_stat.free;
176		#endif
177
178	<	return &mem_stat;
178	>	#ifdef NETBSD
179	>	if ((uvm = get_uvmexp()) == NULL) {
180	>	return NULL;
181	>	}
182	>	#endif
183	>	#ifdef OPENBSD
184	>	mib[0] = CTL_VM;
185	>	mib[1] = VM_UVMEXP;
186
187	+	if (sysctl(mib, 2, NULL, &size, NULL, 0) < 0) {
188	+	return NULL;
189	+	}
190	+
191	+	uvm = malloc(size);
192	+	if (uvm == NULL) {
193	+	return NULL;
194	+	}
195	+
196	+	if (sysctl(mib, 2, uvm, &size, NULL, 0) < 0) {
197	+	return NULL;
198	+	}
199	+	#endif
200	+	#if defined(NETBSD) || defined(OPENBSD)
201	+	mem_stat.total = uvm->pagesize * uvm->npages;
202	+	#ifdef NETBSD
203	+	mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
204	+	#else
205	+	mem_stat.cache = 0;
206	+	#endif
207	+	mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
208	+	mem_stat.used = mem_stat.total - mem_stat.free;
209	+	#endif
210	+
211	+	#ifdef OPENBSD
212	+	free(uvm);
213	+	#endif
214	+
215	+	return &mem_stat;
216		}

Diff Legend

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