ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/i-scream/projects/libstatgrab/src/libstatgrab/os_info.c
(Generate patch)

Comparing projects/libstatgrab/src/libstatgrab/os_info.c (file contents):
Revision 1.5 by pajs, Thu Apr 3 20:14:40 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
# Line 24 | Line 25
25  
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 < #ifdef LINUX
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
# Line 49 | 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 FREEBSD
62 > #ifdef ALLBSD
63 >        int mib[2];
64          struct timeval boottime;
65          time_t curtime;
66          size_t size;
# Line 89 | 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;
103          }
# Line 98 | Line 106 | general_stat_t *get_general_stats(){
106          }
107          fclose(f);
108   #endif
109 < #ifdef FREEBSD
110 <        if (sysctlbyname("kern.boottime", NULL, &size, NULL, NULL) < 0){
111 <                return NULL;
112 <        }
113 <        if (sysctlbyname("kern.boottime", &boottime, &size, NULL, NULL) < 0){
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);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines