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.7 by tdb, Tue May 21 16:47:12 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   #include <stdio.h>
22   #include <stdlib.h>
23 + #ifdef SOLARIS
24 + #include <sys/loadavg.h>
25 + #endif
26   #include "ukcprog.h"
27  
28   char *get_load_stats(){
# Line 18 | Line 41 | char *get_load_stats(){
41                  return NULL;
42          }
43  
44 <        fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2]);
44 >        if((fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2])) != 3){
45 >                errf("Failed to read in sufficent loads");
46 >                return NULL;
47 >        }
48  
49          if ((fclose(f)) != 0) {
50                  errf("Failed to close file (%m).");
# Line 30 | Line 56 | char *get_load_stats(){
56          }
57   #endif
58  
59 <        xml_load_out=strf("<load><load1>%.2lf</load1><load5>%.2lf</load5><loag15>%.2lf</load15></load>\n", loadav[0], loadav[1], loadav[2]);
59 >        xml_load_out=strf("<load><load1>%.2lf</load1><load5>%.2lf</load5><load15>%.2lf</load15></load>", loadav[0], loadav[1], loadav[2]);
60  
61          return xml_load_out;
62   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines