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.24 by ats, Mon Apr 5 15:40:15 2004 UTC

#	Line 1 | Line 1
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-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
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(){
49	>	sg_mem_stats *sg_get_mem_stats(){
50
51	<	static mem_stat_t mem_stat;
51	>	static sg_mem_stats mem_stat;
52
53		#ifdef SOLARIS
54		kstat_ctl_t *kc;
#	Line 49 | Line 57 | mem_stat_t *get_memory_stats(){
57		long totalmem;
58		int pagesize;
59		#endif
60	<	#ifdef LINUX
60	>	#if defined(LINUX) || defined(CYGWIN)
61		char *line_ptr;
62	+	unsigned long long value;
63		FILE *f;
64		#endif
65	<	#ifdef FREEBSD
66	<	long inactive;
65	>	#if defined(FREEBSD) || defined(DFBSD)
66	>	int mib[2];
67	>	u_long physmem;
68		size_t size;
69	+	u_int free_count;
70	+	u_int cache_count;
71	+	u_int inactive_count;
72		int pagesize;
73		#endif
74	+	#if defined(NETBSD) || defined(OPENBSD)
75	+	struct uvmexp *uvm;
76	+	#endif
77
78		#ifdef SOLARIS
79		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
#	Line 87 | Line 103 | mem_stat_t *get_memory_stats(){
103		mem_stat.used = mem_stat.total - mem_stat.free;
104		#endif
105
106	<	#ifdef LINUX
107	<	f=fopen("/proc/meminfo", "r");
92	<	if(f==NULL){
106	>	#if defined(LINUX) || defined(CYGWIN)
107	>	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
108		return NULL;
109		}
110
111	<	if((line_ptr=f_read_line(f, "Mem:"))==NULL){
112	<	fclose(f);
113	<	return NULL;
114	<	}
111	>	while ((line_ptr = sg_f_read_line(f, "")) != NULL) {
112	>	if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
113	>	continue;
114	>	}
115	>	value *= 1024;
116
117	<	fclose(f);
118	<
119	<	/* Linux actually stores this as a unsigned long long, but
120	<	* our structures are just long longs. This shouldn't be a
121	<	* problem for sometime yet :)
122	<	*/
123	<	if((sscanf(line_ptr,"Mem:  %lld %lld %lld %*d %*d %lld", \
108	<	&mem_stat.total, \
109	<	&mem_stat.used, \
110	<	&mem_stat.free, \
111	<	&mem_stat.cache))!=4){
112	<	return NULL;
117	>	if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
118	>	mem_stat.total = value;
119	>	} else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
120	>	mem_stat.free = value;
121	>	} else if (strncmp(line_ptr, "Cached:", 7) == 0) {
122	>	mem_stat.cache = value;
123	>	}
124		}
125
126	+	fclose(f);
127	+	mem_stat.used = mem_stat.total - mem_stat.free;
128		#endif
129
130	<	#ifdef FREEBSD
131	<	/* Returns byes */
132	<	if (sysctlbyname("hw.physmem", NULL, &size, NULL, NULL) < 0){
130	>	#if defined(FREEBSD) || defined(DFBSD)
131	>	/* Returns bytes */
132	>	mib[0] = CTL_HW;
133	>	mib[1] = HW_PHYSMEM;
134	>	size = sizeof physmem;
135	>	if (sysctl(mib, 2, &physmem, &size, NULL, 0) < 0) {
136		return NULL;
137	<	}
138	<	if (sysctlbyname("hw.physmem", &mem_stat.total, &size, NULL, NULL) < 0){
123	<	return NULL;
124	<	}
137	>	}
138	>	mem_stat.total = physmem;
139
140		/*returns pages*/
141	<	if (sysctlbyname("vm.stats.vm.v_free_count", NULL, &size, NULL, NULL) < 0){
141	>	size = sizeof free_count;
142	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
143		return NULL;
129	–	}
130	–	if (sysctlbyname("vm.stats.vm.v_free_count", &mem_stat.free, &size, NULL, NULL) < 0){
131	–	return NULL;
144		}
145
146	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", NULL, &size, NULL, NULL) < 0){
146	>	size = sizeof inactive_count;
147	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
148		return NULL;
136	–	}
137	–	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive , &size, NULL, NULL) < 0){
138	–	return NULL;
149		}
150
151	<	if (sysctlbyname("vm.stats.vm.v_cache_count", NULL, &size, NULL, NULL) < 0){
151	>	size = sizeof cache_count;
152	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
153		return NULL;
143	–	}
144	–	if (sysctlbyname("vm.stats.vm.v_cache_count", &mem_stat.cache, &size, NULL, NULL) < 0){
145	–	return NULL;
154		}
155
156	<	/* Because all the vm.stats returns pages, i need to get the page size.
157	<	* After that i then need to multiple the anything that used vm.stats to get
158	<	* the system statistics by pagesize
156	>	/* Because all the vm.stats returns pages, I need to get the page size.
157	>	* After that I then need to multiple the anything that used vm.stats to
158	>	* get the system statistics by pagesize
159		*/
160		if ((pagesize=getpagesize()) == -1){
161		return NULL;
162		}
163
164	<	mem_stat.cache=mem_stat.cache*pagesize;
165	<	/* Of couse nothing is ever that simple :) And i have inactive pages to deal
166	<	* with too. So im goingto add them to free memory :)
164	>	mem_stat.cache=cache_count*pagesize;
165	>
166	>	/* Of couse nothing is ever that simple :) And I have inactive pages to
167	>	* deal with too. So I'm going to add them to free memory :)
168		*/
169	<	mem_stat.free=(mem_stat.free*pagesize)+(inactive*pagesize);
170	<
171	<	mem_stat.used=mem_stat.total-mem_stat.free;
169	>	mem_stat.free=(free_count*pagesize)+(inactive_count*pagesize);
170	>	mem_stat.used=physmem-mem_stat.free;
171	>	#endif
172
173	+	#if defined(NETBSD) || defined(OPENBSD)
174	+	if ((uvm = sg_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
188
189		return &mem_stat;
167	–
190		}

Diff Legend

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