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.6 by tdb, Sat May 18 18:15:56 2002 UTC

# Line 1 | Line 1
1 + /*
2 + * i-scream central monitoring system
3 + * Copyright (C) 2000-2002 i-scream
4 + *
5 + * This program is free software; you can redistribute it and/or
6 + * modify it under the terms of the GNU General Public License
7 + * as published by the Free Software Foundation; either version 2
8 + * of the License, or (at your option) any later version.
9 + *
10 + * This program is distributed in the hope that it will be useful,
11 + * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
13 + * GNU General Public License for more details.
14 + *
15 + * You should have received a copy of the GNU General Public License
16 + * along with this program; if not, write to the Free Software
17 + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
18 + */
19 +
20   #include <stdio.h>
21   #include <stdlib.h>
22 + #ifdef SOLARIS
23 + #include <sys/loadavg.h>
24 + #endif
25   #include "ukcprog.h"
26  
27   char *get_load_stats(){
# Line 18 | Line 40 | char *get_load_stats(){
40                  return NULL;
41          }
42  
43 <        fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2]);
43 >        if((fscanf(f,"%lf %lf %lf", &loadav[0], &loadav[1], &loadav[2])) != 3){
44 >                errf("Failed to read in sufficent loads");
45 >                return NULL;
46 >        }
47  
48          if ((fclose(f)) != 0) {
49                  errf("Failed to close file (%m).");
# Line 30 | Line 55 | char *get_load_stats(){
55          }
56   #endif
57  
58 <        xml_load_out=strf("<load><load1>%.2lf</load1><load5>%.2lf</load5><loag15>%.2lf</load15></load>\n", loadav[0], loadav[1], loadav[2]);
58 >        xml_load_out=strf("<load><load1>%.2lf</load1><load5>%.2lf</load5><load15>%.2lf</load15></load>", loadav[0], loadav[1], loadav[2]);
59  
60          return xml_load_out;
61   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines