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

Comparing projects/cms/source/ihost/libstatgrab/load_stat.c (file contents):
Revision 1.2 by tdb, Mon May 13 11:42:24 2002 UTC vs.
Revision 1.9 by tdb, Thu May 30 12:33:08 2002 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
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.
10 + *
11 + * This program 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.
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.
19 + */
20 +
21 + #ifdef HAVE_CONFIG_H
22 + #include "config.h"
23 + #endif
24 +
25   #include <stdio.h>
26   #include <stdlib.h>
27 + #ifdef SOLARIS
28 + #include <sys/loadavg.h>
29 + #endif
30   #include "ukcprog.h"
31  
32   char *get_load_stats(){
33  
34          double loadav[3];
35          char *xml_load_out;
36 < #ifdef OLDLINUX
36 > #if !defined(HAVE_GETLOADAVG) && defined(LINUX)
37          FILE *f;
38          char *loadavg;
39          char *load_p;
40   #endif
41  
42 < #ifdef OLDLINUX
42 > #if !defined(HAVE_GETLOADAVG) && defined(LINUX)
43          if ((f=fopen("/proc/loadavg", "r" ))==NULL) {
44                  errf("Failed to open load averages (%m)");
45                  return NULL;
46          }
47  
48 <        fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2]);
48 >        if((fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2])) != 3){
49 >                errf("Failed to read in sufficent loads");
50 >                return NULL;
51 >        }
52  
53          if ((fclose(f)) != 0) {
54                  errf("Failed to close file (%m).");
# Line 30 | Line 60 | char *get_load_stats(){
60          }
61   #endif
62  
63 <        xml_load_out=strf("<load><load1>%.2lf</load1><load5>%.2lf</load5><loag15>%.2lf</load15></load>\n", loadav[0], loadav[1], loadav[2]);
63 >        xml_load_out=strf("<load><load1>%.2lf</load1><load5>%.2lf</load5><load15>%.2lf</load15></load>", loadav[0], loadav[1], loadav[2]);
64  
65          return xml_load_out;
66   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines