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.8 by ats, Sat Oct 18 23:04:23 2003 UTC vs.
Revision 1.9 by ats, Sun Oct 19 02:03:02 2003 UTC

# Line 24 | Line 24
24  
25   #include <sys/utsname.h>
26   #include "statgrab.h"
27 + #include <stdlib.h>
28   #ifdef SOLARIS
29   #include <kstat.h>
30   #include <time.h>
# Line 31 | Line 32
32   #ifdef LINUX
33   #include <stdio.h>
34   #endif
35 + #ifdef ALLBSD
36   #ifdef FREEBSD
37   #include <sys/types.h>
38   #include <sys/sysctl.h>
39 + #else
40 + #include <sys/param.h>
41 + #include <sys/sysctl.h>
42 + #endif
43   #include <time.h>
44   #include <sys/time.h>
45   #endif
# Line 52 | Line 58 | general_stat_t *get_general_stats(){
58   #ifdef LINUX
59          FILE *f;
60   #endif
61 < #ifdef FREEBSD
61 > #ifdef ALLBSD
62 >        int mib[2];
63          struct timeval boottime;
64          time_t curtime;
65          size_t size;
# Line 92 | Line 99 | general_stat_t *get_general_stats(){
99   #ifdef LINUX
100          if ((f=fopen("/proc/uptime", "r")) == NULL) {
101                  return NULL;
102 +        size = sizeof boottime;
103          }
104          if((fscanf(f,"%lu %*d",&general_stat.uptime)) != 1){
105                  return NULL;
106          }
107          fclose(f);
108   #endif
109 < #ifdef FREEBSD
109 > #ifdef ALLBSD
110 >        mib[0] = CTL_KERN;
111 >        mib[1] = KERN_BOOTTIME;
112          size = sizeof boottime;
113 <        if (sysctlbyname("kern.boottime", &boottime, &size, NULL, 0) < 0){
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