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.11 by ats, Sat Oct 18 23:04:23 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 54 | Line 54 | mem_stat_t *get_memory_stats(){
54		FILE *f;
55		#endif
56		#ifdef FREEBSD
57	<	long inactive;
57	>	u_int free_count;
58	>	u_int cache_count;
59	>	u_int inactive_count;
60	>	u_long physmem;
61		size_t size;
62		int pagesize;
63		#endif
#	Line 115 | Line 118 | mem_stat_t *get_memory_stats(){
118		#endif
119
120		#ifdef FREEBSD
121	<	/* Returns byes */
122	<	if (sysctlbyname("hw.physmem", NULL, &size, NULL, NULL) < 0){
121	>	/* Returns bytes */
122	>	size = sizeof physmem;
123	>	if (sysctlbyname("hw.physmem", &physmem, &size, NULL, 0) < 0){
124		return NULL;
121	–	}
122	–	if (sysctlbyname("hw.physmem", &mem_stat.total, &size, NULL, NULL) < 0){
123	–	return NULL;
125		}
126
127		/*returns pages*/
128	<	if (sysctlbyname("vm.stats.vm.v_free_count", NULL, &size, NULL, NULL) < 0){
128	>	size = sizeof free_count;
129	>	if (sysctlbyname("vm.stats.vm.v_free_count", &free_count, &size, NULL, 0) < 0){
130		return NULL;
129	–	}
130	–	if (sysctlbyname("vm.stats.vm.v_free_count", &mem_stat.free, &size, NULL, NULL) < 0){
131	–	return NULL;
131		}
132
133	<	if (sysctlbyname("vm.stats.vm.v_inactive_count", NULL, &size, NULL, NULL) < 0){
133	>	size = sizeof inactive_count;
134	>	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive_count , &size, NULL, 0) < 0){
135		return NULL;
136	–	}
137	–	if (sysctlbyname("vm.stats.vm.v_inactive_count", &inactive , &size, NULL, NULL) < 0){
138	–	return NULL;
136		}
137
138	<	if (sysctlbyname("vm.stats.vm.v_cache_count", NULL, &size, NULL, NULL) < 0){
138	>	size = sizeof cache_count;
139	>	if (sysctlbyname("vm.stats.vm.v_cache_count", &cache_count, &size, NULL, 0) < 0){
140		return NULL;
143	–	}
144	–	if (sysctlbyname("vm.stats.vm.v_cache_count", &mem_stat.cache, &size, NULL, NULL) < 0){
145	–	return NULL;
141		}
142
143	<	/* Because all the vm.stats returns pages, i need to get the page size.
144	<	* After that i then need to multiple the anything that used vm.stats to get
145	<	* the system statistics by pagesize
143	>	/* Because all the vm.stats returns pages, I need to get the page size.
144	>	* After that I then need to multiple the anything that used vm.stats to
145	>	* get the system statistics by pagesize
146		*/
147		if ((pagesize=getpagesize()) == -1){
148		return NULL;
149		}
150
151	<	mem_stat.cache=mem_stat.cache*pagesize;
152	<	/* Of couse nothing is ever that simple :) And i have inactive pages to deal
158	<	* with too. So im goingto add them to free memory :)
159	<	*/
160	<	mem_stat.free=(mem_stat.free*pagesize)+(inactive*pagesize);
161	<
162	<	mem_stat.used=mem_stat.total-mem_stat.free;
151	>	mem_stat.total=physmem;
152	>	mem_stat.cache=cache_count*pagesize;
153
154	+	/* Of couse nothing is ever that simple :) And I have inactive pages to
155	+	* deal with too. So I'm going to add them to free memory :)
156	+	*/
157	+	mem_stat.free=(free_count*pagesize)+(inactive_count*pagesize);
158	+	mem_stat.used=physmem-mem_stat.free;
159		#endif
160
161		return &mem_stat;

Diff Legend

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