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.1 by pajs, Tue Feb 18 19:28:30 2003 UTC vs.
Revision 1.11 by pajs, Tue Feb 10 14:44:18 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 > * $Id$
22   */
23  
24   #ifdef HAVE_CONFIG_H
25   #include "config.h"
26   #endif
27  
25 #include "statgrab.h"
28   #include <stdio.h>
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 < #include "ukcprog.h"
37 > #endif
38  
39   load_stat_t *get_load_stats(){
40  
41          static load_stat_t load_stat;
42  
43          double loadav[3];
38 #if !defined(HAVE_GETLOADAVG) && defined(LINUX)
39        FILE *f;
40        char *loadavg;
41        char *load_p;
42 #endif
44  
45 < #if !defined(HAVE_GETLOADAVG) && defined(LINUX)
46 <        if ((f=fopen("/proc/loadavg", "r" ))==NULL) {
47 <                errf("Failed to open load averages (%m)");
47 <                return NULL;
48 <        }
45 > #ifdef CYGWIN
46 >        return NULL;
47 > #else
48  
49 <        if((fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2])) != 3){
51 <                errf("Failed to read in sufficent loads");
52 <                return NULL;
53 <        }
49 > #if defined(SOLARIS) && !defined(HAVE_SYS_LOADAVG_H)
50  
51 <        if ((fclose(f)) != 0) {
52 <                errf("Failed to close file (%m).");
53 <                return NULL;
54 <        }
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 <        if((getloadavg(loadav,3)) == -1){
61 <                errf("Failed to get load averages (%m)");
62 <        }
63 < #endif
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 <
90 > #endif
91   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines