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.15 by ats, Fri Oct 24 17:03:20 2003 UTC vs.
Revision 1.18 by tdb, Fri Jan 16 15:54:54 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
22		#ifdef HAVE_CONFIG_H
#	Line 28 | Line 29
29		#include <unistd.h>
30		#include <kstat.h>
31		#endif
32	<	#ifdef LINUX
32	>	#if defined(LINUX) || defined(CYGWIN)
33		#include <stdio.h>
34		#include <string.h>
35		#endif
#	Line 49 | Line 50 | mem_stat_t *get_memory_stats(){
50		long totalmem;
51		int pagesize;
52		#endif
53	<	#ifdef LINUX
53	>	#if defined(LINUX) || defined(CYGWIN)
54		char *line_ptr;
55		unsigned long long value;
56		FILE *f;
#	Line 95 | Line 96 | mem_stat_t *get_memory_stats(){
96		mem_stat.used = mem_stat.total - mem_stat.free;
97		#endif
98
99	<	#ifdef LINUX
100	<	f = fopen("/proc/meminfo", "r");
100	<	if (f == NULL) {
99	>	#if defined(LINUX) || defined(CYGWIN)
100	>	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
101		return NULL;
102		}
103
104		while ((line_ptr = f_read_line(f, "")) != NULL) {
105	<	if (sscanf(line_ptr, "%*s %lld kB", &value) != 2) {
105	>	if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
106		continue;
107		}
108		value *= 1024;

Diff Legend

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