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

Comparing projects/libstatgrab/src/libstatgrab/load_stats.c (file contents):
Revision 1.9 by tdb, Mon Jan 19 16:49:21 2004 UTC vs.
Revision 1.12 by ats, Mon Apr 5 15:40:15 2004 UTC

# Line 29 | Line 29
29   #include <stdlib.h>
30   #include "statgrab.h"
31   #ifdef SOLARIS
32 + #ifdef HAVE_SYS_LOADAVG_H
33   #include <sys/loadavg.h>
34 + #else
35 + #include <kstat.h>
36   #endif
37 + #endif
38  
39 < load_stat_t *get_load_stats(){
39 > sg_load_stats *sg_get_load_stats(){
40  
41 <        static load_stat_t load_stat;
41 >        static sg_load_stats load_stat;
42  
43          double loadav[3];
44  
# Line 42 | Line 46 | load_stat_t *get_load_stats(){
46          return NULL;
47   #else
48  
49 + #if defined(SOLARIS) && !defined(HAVE_SYS_LOADAVG_H)
50 +
51 +        kstat_ctl_t *kc;        
52 +        kstat_t *ksp;
53 +        kstat_named_t *kn;
54 +
55 +        if ((kc = kstat_open()) == NULL) {
56 +                return NULL;
57 +        }
58 +
59 +        if((ksp=kstat_lookup(kc, "unix", 0, "system_misc")) == NULL){
60 +                return NULL;
61 +        }
62 +
63 +        if (kstat_read(kc, ksp, 0) == -1) {
64 +                return NULL;
65 +        }
66 +
67 +        if((kn=kstat_data_lookup(ksp, "avenrun_1min")) == NULL){
68 +                return NULL;
69 +        }
70 +        load_stat.min1 = (double)kn->value.ui32 / (double)256;
71 +
72 +        if((kn=kstat_data_lookup(ksp, "avenrun_5min")) == NULL){
73 +                return NULL;
74 +        }
75 +        load_stat.min5 = (double)kn->value.ui32 / (double)256;
76 +
77 +        if((kn=kstat_data_lookup(ksp, "avenrun_15min")) == NULL){
78 +                return NULL;
79 +        }
80 +        load_stat.min15 = (double)kn->value.ui32 / (double)256;
81 + #else
82          getloadavg(loadav,3);
83  
84          load_stat.min1=loadav[0];
85          load_stat.min5=loadav[1];
86          load_stat.min15=loadav[2];
87 + #endif
88  
89          return &load_stat;
90   #endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines