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.12 by ats, Sun Oct 19 02:03:02 2003 UTC vs.
Revision 1.19 by tdb, Mon Jan 19 16:49:21 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 28 | Line 31
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>
37		#endif
35	–	#ifdef ALLBSD
38		#ifdef FREEBSD
39		#include <sys/types.h>
40		#include <sys/sysctl.h>
39	–	#else
40	–	#include <sys/param.h>
41	–	#include <sys/sysctl.h>
42	–	#endif
41		#include <unistd.h>
42		#endif
43
#	Line 54 | Line 52 | mem_stat_t *get_memory_stats(){
52		long totalmem;
53		int pagesize;
54		#endif
55	<	#ifdef LINUX
55	>	#if defined(LINUX) || defined(CYGWIN)
56		char *line_ptr;
57	+	unsigned long long value;
58		FILE *f;
59		#endif
61	–	#ifdef ALLBSD
62	–	int mib[2];
60		#ifdef FREEBSD
61	+	int mib[2];
62	+	u_long physmem;
63	+	size_t size;
64		u_int free_count;
65		u_int cache_count;
66		u_int inactive_count;
#	Line 69 | Line 69 | mem_stat_t *get_memory_stats(){
69		#ifdef NETBSD
70		struct uvmexp *uvm;
71		#endif
72	–	u_long physmem;
73	–	size_t size;
74	–	#endif
72
73		#ifdef SOLARIS
74		if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
#	Line 101 | Line 98 | mem_stat_t *get_memory_stats(){
98		mem_stat.used = mem_stat.total - mem_stat.free;
99		#endif
100
101	<	#ifdef LINUX
102	<	f=fopen("/proc/meminfo", "r");
106	<	if(f==NULL){
101	>	#if defined(LINUX) || defined(CYGWIN)
102	>	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
103		return NULL;
104		}
105
106	<	if((line_ptr=f_read_line(f, "Mem:"))==NULL){
107	<	fclose(f);
108	<	return NULL;
109	<	}
106	>	while ((line_ptr = f_read_line(f, "")) != NULL) {
107	>	if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
108	>	continue;
109	>	}
110	>	value *= 1024;
111
112	<	fclose(f);
113	<
114	<	/* Linux actually stores this as a unsigned long long, but
115	<	* our structures are just long longs. This shouldn't be a
116	<	* problem for sometime yet :)
117	<	*/
118	<	if((sscanf(line_ptr,"Mem:  %lld %lld %lld %*d %*d %lld", \
122	<	size = sizeof physmem;
123	<	&mem_stat.total, \
124	<	&mem_stat.used, \
125	<	&mem_stat.free, \
126	<	&mem_stat.cache))!=4){
127	<	return NULL;
112	>	if (strncmp(line_ptr, "MemTotal:", 9) == 0) {
113	>	mem_stat.total = value;
114	>	} else if (strncmp(line_ptr, "MemFree:", 8) == 0) {
115	>	mem_stat.free = value;
116	>	} else if (strncmp(line_ptr, "Cached:", 7) == 0) {
117	>	mem_stat.cache = value;
118	>	}
119		}
120
121	+	fclose(f);
122	+	mem_stat.used = mem_stat.total - mem_stat.free;
123		#endif
124
125	<	#ifdef ALLBSD
125	>	#ifdef FREEBSD
126		/* Returns bytes */
127		mib[0] = CTL_HW;
128		mib[1] = HW_PHYSMEM;
#	Line 140 | Line 133 | mem_stat_t *get_memory_stats(){
133		mem_stat.total = physmem;
134
135		/*returns pages*/
143	–	#ifdef FREEBSD
136		size = sizeof free_count;
137		if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
138		return NULL;
#	Line 172 | Line 164 | mem_stat_t *get_memory_stats(){
164		mem_stat.free=(free_count*pagesize)+(inactive_count*pagesize);
165		mem_stat.used=physmem-mem_stat.free;
166		#endif
167	+
168		#ifdef NETBSD
176	–	/* FIXME This is not consistent with the FreeBSD logic above. */
169		if ((uvm = get_uvmexp()) == NULL) {
170		return NULL;
171		}
172	+	mem_stat.total = uvm->pagesize * uvm->npages;
173		mem_stat.cache = uvm->pagesize * (uvm->filepages + uvm->execpages);
174	<	mem_stat.free = uvm->pagesize * uvm->free;
175	<	mem_stat.used = uvm->pagesize * (uvm->npages - uvm->free);
174	>	mem_stat.free = uvm->pagesize * (uvm->free + uvm->inactive);
175	>	mem_stat.used = mem_stat.total - mem_stat.free;
176		#endif
184	–	#endif
177
178		return &mem_stat;
187	–
179		}

Diff Legend

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