ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/i-scream/projects/libstatgrab/src/libstatgrab/os_info.c

Comparing projects/libstatgrab/src/libstatgrab/os_info.c (file contents):
Revision 1.9 by ats, Sun Oct 19 02:03:02 2003 UTC vs.
Revision 1.12 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 29 | Line 30
30		#include <kstat.h>
31		#include <time.h>
32		#endif
33	<	#ifdef LINUX
33	>	#if defined(LINUX) || defined(CYGWIN)
34		#include <stdio.h>
35		#endif
36		#ifdef ALLBSD
#	Line 55 | Line 56 | general_stat_t *get_general_stats(){
56		kstat_t *ksp;
57		kstat_named_t *kn;
58		#endif
59	<	#ifdef LINUX
59	>	#if defined(LINUX) || defined(CYGWIN)
60		FILE *f;
61		#endif
62		#ifdef ALLBSD
#	Line 96 | Line 97 | general_stat_t *get_general_stats(){
97		time(&curtime);
98		general_stat.uptime = curtime - boottime;
99		#endif
100	<	#ifdef LINUX
100	>	#if defined(LINUX) || defined(CYGWIN)
101		if ((f=fopen("/proc/uptime", "r")) == NULL) {
102		return NULL;
102	–	size = sizeof boottime;
103		}
104		if((fscanf(f,"%lu %*d",&general_stat.uptime)) != 1){
105		return NULL;

Diff Legend

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