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.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
#	Line 49 | 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;
#	Line 95 | 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");
100	<	if (f == NULL) {
101	>	#if defined(LINUX) || defined(CYGWIN)
102	>	if ((f = fopen("/proc/meminfo", "r")) == NULL) {
103		return NULL;
104		}
105
106		while ((line_ptr = f_read_line(f, "")) != NULL) {
107	<	if (sscanf(line_ptr, "%*s %lld kB", &value) != 2) {
107	>	if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
108		continue;
109		}
110		value *= 1024;

Diff Legend

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