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.3 by tdb, Fri Feb 28 22:59:35 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.uk
4	<	* Copyright (C) 2000-2002 i-scream
3	>	* http://www.i-scream.org
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
23		#include "config.h"
24		#endif
25
25	–	#include <stdio.h>
26		#include <sys/utsname.h>
27		#include "statgrab.h"
28	+	#include <stdlib.h>
29		#ifdef SOLARIS
30		#include <kstat.h>
31		#include <time.h>
32		#endif
33	+	#if defined(LINUX) || defined(CYGWIN)
34	+	#include <stdio.h>
35	+	#endif
36	+	#ifdef ALLBSD
37	+	#ifdef FREEBSD
38	+	#include <sys/types.h>
39	+	#include <sys/sysctl.h>
40	+	#else
41	+	#include <sys/param.h>
42	+	#include <sys/sysctl.h>
43	+	#endif
44	+	#include <time.h>
45	+	#include <sys/time.h>
46	+	#endif
47
48		general_stat_t *get_general_stats(){
49
50		static general_stat_t general_stat;
51	+	static struct utsname os;
52
53	<	struct utsname os;
53	>	#ifdef SOLARIS
54		time_t boottime,curtime;
55		kstat_ctl_t *kc;
56		kstat_t *ksp;
57		kstat_named_t *kn;
58	+	#endif
59	+	#if defined(LINUX) || defined(CYGWIN)
60	+	FILE *f;
61	+	#endif
62	+	#ifdef ALLBSD
63	+	int mib[2];
64	+	struct timeval boottime;
65	+	time_t curtime;
66	+	size_t size;
67	+	#endif
68
69		if((uname(&os)) < 0){
70		return NULL;
#	Line 51 | Line 77 | general_stat_t *get_general_stats(){
77		general_stat.hostname = os.nodename;
78
79		/* get uptime */
80	+	#ifdef SOLARIS
81		if ((kc = kstat_open()) == NULL) {
82		return NULL;
83		}
#	Line 69 | Line 96 | general_stat_t *get_general_stats(){
96
97		time(&curtime);
98		general_stat.uptime = curtime - boottime;
99	+	#endif
100	+	#if defined(LINUX) || defined(CYGWIN)
101	+	if ((f=fopen("/proc/uptime", "r")) == NULL) {
102	+	return NULL;
103	+	}
104	+	if((fscanf(f,"%lu %*d",&general_stat.uptime)) != 1){
105	+	return NULL;
106	+	}
107	+	fclose(f);
108	+	#endif
109	+	#ifdef ALLBSD
110	+	mib[0] = CTL_KERN;
111	+	mib[1] = KERN_BOOTTIME;
112	+	size = sizeof boottime;
113	+	if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0){
114	+	return NULL;
115	+	}
116	+	time(&curtime);
117	+	general_stat.uptime=curtime-boottime.tv_sec;
118	+	#endif
119
120		return &general_stat;
121

Diff Legend

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