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.8 by tdb, Fri Jan 16 15:54:54 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  
22   #ifdef HAVE_CONFIG_H
23   #include "config.h"
24   #endif
25  
25 #include "statgrab.h"
26   #include <stdio.h>
27   #include <stdlib.h>
28 + #include "statgrab.h"
29   #ifdef SOLARIS
30   #include <sys/loadavg.h>
31   #endif
31 #include "ukcprog.h"
32  
33   load_stat_t *get_load_stats(){
34  
35          static load_stat_t load_stat;
36  
37          double loadav[3];
38 #if !defined(HAVE_GETLOADAVG) && defined(LINUX)
39        FILE *f;
40        char *loadavg;
41        char *load_p;
42 #endif
38  
39 < #if !defined(HAVE_GETLOADAVG) && defined(LINUX)
40 <        if ((f=fopen("/proc/loadavg", "r" ))==NULL) {
46 <                errf("Failed to open load averages (%m)");
47 <                return NULL;
48 <        }
49 <
50 <        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 <        }
54 <
55 <        if ((fclose(f)) != 0) {
56 <                errf("Failed to close file (%m).");
57 <                return NULL;
58 <        }
39 > #ifdef CYGWIN
40 >        return NULL;
41   #else
60        if((getloadavg(loadav,3)) == -1){
61                errf("Failed to get load averages (%m)");
62        }
63 #endif
42  
43 +        getloadavg(loadav,3);
44 +
45          load_stat.min1=loadav[0];
46          load_stat.min5=loadav[1];
47          load_stat.min15=loadav[2];
48  
49          return &load_stat;
50 <
50 > #endif
51   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines