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.17 by tdb, Wed Apr 7 14:53:40 2004 UTC vs.
Revision 1.21 by ats, Sat Nov 6 14:55:53 2004 UTC

# Line 46 | Line 46
46   #include <time.h>
47   #include <sys/time.h>
48   #endif
49 + #ifdef HPUX
50 + #include <sys/param.h>
51 + #include <sys/pstat.h>
52 + #include <time.h>
53 + #endif
54  
55   sg_host_info *sg_get_host_info(){
56  
57 <        static sg_host_info general_stat;      
57 >        static sg_host_info general_stat;
58          static struct utsname os;
59  
60 + #ifdef HPUX
61 +        struct pst_static *pstat_static;
62 +        time_t currtime;
63 +        long boottime;
64 + #endif
65   #ifdef SOLARIS
66          time_t boottime,curtime;
67          kstat_ctl_t *kc;
# Line 69 | Line 79 | sg_host_info *sg_get_host_info(){
79   #endif
80  
81          if((uname(&os)) < 0){
82 +                sg_set_error_with_errno(SG_ERROR_UNAME, NULL);
83                  return NULL;
84          }
85          
# Line 79 | Line 90 | sg_host_info *sg_get_host_info(){
90          general_stat.hostname = os.nodename;
91  
92          /* get uptime */
93 + #ifdef HPUX
94 +        pstat_static = sg_get_pstat_static();
95 +        if (pstat_static == NULL) {
96 +                return NULL;
97 +        }
98 +
99 +        currtime = time(NULL);
100 +
101 +        boottime = pstat_static->boot_time;
102 +
103 +        general_stat.uptime = currtime - boottime;
104 + #endif
105   #ifdef SOLARIS
106          if ((kc = kstat_open()) == NULL) {
107 +                sg_set_error(SG_ERROR_KSTAT_OPEN, NULL);
108                  return NULL;
109          }
110          if((ksp=kstat_lookup(kc, "unix", -1, "system_misc"))==NULL){
111 +                sg_set_error(SG_ERROR_KSTAT_LOOKUP, "unix,-1,system_misc");
112                  return NULL;
113          }
114          if (kstat_read(kc, ksp, 0) == -1) {
115 +                sg_set_error(SG_ERROR_KSTAT_READ, NULL);
116                  return NULL;
117          }
118          if((kn=kstat_data_lookup(ksp, "boot_time")) == NULL){
119 +                sg_set_error(SG_ERROR_KSTAT_DATA_LOOKUP, "boot_time");
120                  return NULL;
121          }
122          boottime=(kn->value.ui32);
# Line 101 | Line 128 | sg_host_info *sg_get_host_info(){
128   #endif
129   #if defined(LINUX) || defined(CYGWIN)
130          if ((f=fopen("/proc/uptime", "r")) == NULL) {
131 +                sg_set_error_with_errno(SG_ERROR_OPEN, "/proc/uptime");
132                  return NULL;
133          }
134          if((fscanf(f,"%lu %*d",&general_stat.uptime)) != 1){
135 +                sg_set_error(SG_ERROR_PARSE, NULL);
136                  return NULL;
137          }
138          fclose(f);
# Line 113 | Line 142 | sg_host_info *sg_get_host_info(){
142          mib[1] = KERN_BOOTTIME;
143          size = sizeof boottime;
144          if (sysctl(mib, 2, &boottime, &size, NULL, 0) < 0){
145 +                sg_set_error_with_errno(SG_ERROR_SYSCTL,
146 +                                        "CTL_KERN.KERN_BOOTTIME");
147                  return NULL;
148          }
149          time(&curtime);

Diff Legend

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