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

Comparing projects/cms/source/ihost/libstatgrab/memory_stats.c (file contents):
Revision 1.3 by tdb, Thu May 16 15:25:45 2002 UTC vs.
Revision 1.7 by pajs, Tue May 21 16:21:38 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   #ifdef LINUX
22   #include <string.h>
# Line 14 | Line 33
33   #include "ukcprog.h"
34  
35   char *get_memory_stats(){
36 <        long total=0;
37 <        long free=0;
38 <        long used=0;
39 <        long cache=0;
36 >        long long total=0;
37 >        long long free=0;
38 >        long long used=0;
39 >        long long cache=0;
40          char *xml_memory_stats;
41   #ifdef LINUX
42          FILE *f;
43          char *line;
44 <        long buffers;
44 >        long long buffers;
45   #endif
46   #ifdef SOLARIS
47          kstat_ctl_t *kc;
# Line 48 | Line 67 | char *get_memory_stats(){
67          }
68          while((line=fpgetline(f)) != NULL){
69                  if (((strncmp(line,"Mem:",4)) == 0)) {
70 <                        if((sscanf(line, "%*s %ld %ld %ld %*s %ld %ld", &total, &used, &free, &buffers, &cache)) != 5){
70 >                        if((sscanf(line, "%*s %lld %lld %lld %*s %lld %lld", &total, &used, &free, &buffers, &cache)) != 5){
71                                  errf("Failed to read memory details (%m)");
72                                  return NULL;
73                          }
# Line 95 | Line 114 | char *get_memory_stats(){
114                  errf("Failed to get free memory (%m)");
115                  return NULL;
116          }
117 +        if((kstat_close(kc)) != 0){
118 +                errf("Failed to close kstat control structure (%m)");
119 +                return NULL;
120 +        }      
121          total=((totalmem*pagesize)/1024)/1024;
122          free=(((kn->value.ul)*pagesize)/1024)/1024;
123          used=total-free;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines