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.7 by tdb, Wed Nov 12 11:48:06 2003 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines