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.5 by tdb, Mon Nov 10 21:07:04 2003 UTC vs.
Revision 1.10 by pajs, Tue Feb 10 12:24:08 2004 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * i-scream central monitoring system
3   * http://www.i-scream.org
4 < * Copyright (C) 2000-2003 i-scream
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
# Line 26 | 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(){
40  
41          static load_stat_t load_stat;
42  
43          double loadav[3];
37        loadav[0] = loadav[1] = loadav[2] = 0;
44  
45 <        /* No load averages on cygwin */
46 < #ifndef CYGWIN
47 <        getloadavg(loadav,3);
42 < #endif
45 > #ifdef CYGWIN
46 >        return NULL;
47 > #else
48  
49 + #if defined(SOLARIS) && !defined(HAVE_SYS_LOADAVG_H)
50 +        kstat_ctl_t *kc;
51 +        kstat_t *ksp;
52 +        kstat_named_t *kn;
53 +
54 +        if ((kc = kstat_open()) == NULL) {
55 +                return NULL;
56 +        }
57 +
58 +        if((ksp=kstat_lookup(kc, "unix", 0, "system_pages")) == NULL){
59 +                return NULL;
60 +        }
61 +
62 +        if (kstat_read(kc, ksp, 0) == -1) {
63 +                return NULL;
64 +        }
65 +
66 +        if((kn=kstat_data_lookup(ksp, "avenrun_1min")) == NULL){
67 +                return NULL;
68 +        }
69 +        load_stat.min1 = kn->value.ui32;
70 +
71 +        if((kn=kstat_data_lookup(ksp, "avenrun_5min")) == NULL){
72 +                return NULL;
73 +        }
74 +        load_stat.min5 = kn->value.ui32;
75 +
76 +        if((kn=kstat_data_lookup(ksp, "avenrun_15min")) == NULL){
77 +                return NULL;
78 +        }
79 +        load_stat.min15 = kn->value.ui32;
80 + #else
81 +        getloadavg(loadav,3);
82 +
83          load_stat.min1=loadav[0];
84          load_stat.min5=loadav[1];
85          load_stat.min15=loadav[2];
86 + #endif
87  
88          return &load_stat;
89 <
89 > #endif
90   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines