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

Comparing projects/libstatgrab/src/libstatgrab/page_stats.c (file contents):
Revision 1.9 by ats, Sun Oct 19 02:03:02 2003 UTC vs.
Revision 1.14 by tdb, Mon Jan 19 16:49:21 2004 UTC

# Line 1 | Line 1
1 < /*
1 > /*
2   * i-scream central monitoring system
3   * http://www.i-scream.org
4 < * Copyright (C) 2000-2003 i-scream
4 > * Copyright (C) 2000-2004 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.
6 > * This library is free software; you can redistribute it and/or
7 > * modify it under the terms of the GNU Lesser General Public
8 > * License as published by the Free Software Foundation; either
9 > * version 2.1 of the License, or (at your option) any later version.
10   *
11 < * This program is distributed in the hope that it will be useful,
11 > * This library 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.
13 > * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14 > * Lesser 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.
16 > * You should have received a copy of the GNU Lesser General Public
17 > * License along with this library; if not, write to the Free Software
18 > * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
19 > * 02111-1307 USA
20 > *
21 > * $Id$
22   */
23  
24   #ifdef HAVE_CONFIG_H
# Line 30 | Line 33
33   #include <sys/sysinfo.h>
34   #include <string.h>
35   #endif
36 < #ifdef LINUX
36 > #if defined(LINUX) || defined(CYGWIN)
37   #include <stdio.h>
38 + #include <string.h>
39   #endif
40   #ifdef FREEBSD
41   #include <sys/types.h>
# Line 47 | Line 51 | page_stat_t *get_page_stats(){
51          kstat_t *ksp;
52          cpu_stat_t cs;
53   #endif
54 < #ifdef LINUX
54 > #if defined(LINUX) || defined(CYGWIN)
55          FILE *f;
56          char *line_ptr;
57   #endif
# Line 78 | Line 82 | page_stat_t *get_page_stats(){
82  
83          kstat_close(kc);
84   #endif
85 < #ifdef LINUX
86 <        if((f=fopen("/proc/stat", "r"))==NULL){
87 <                return NULL;
88 <        }
89 <        if((line_ptr=f_read_line(f, "page"))==NULL){
85 > #if defined(LINUX) || defined(CYGWIN)
86 >        if ((f = fopen("/proc/vmstat", "r")) != NULL) {
87 >                while ((line_ptr = f_read_line(f, "")) != NULL) {
88 >                        long long value;
89 >
90 >                        if (sscanf(line_ptr, "%*s %lld", &value) != 1) {
91 >                                continue;
92 >                        }
93 >
94 >                        if (strncmp(line_ptr, "pgpgin ", 7) == 0) {
95 >                                page_stats.pages_pagein = value;
96 >                        } else if (strncmp(line_ptr, "pgpgout ", 8) == 0) {
97 >                                page_stats.pages_pageout = value;
98 >                        }
99 >                }
100 >
101                  fclose(f);
102 +        } else if ((f = fopen("/proc/stat", "r")) != NULL) {
103 +                if ((line_ptr = f_read_line(f, "page")) == NULL) {
104 +                        fclose(f);
105 +                        return NULL;
106 +                }
107 +
108 +                if (sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout) != 2) {
109 +                        fclose(f);
110 +                        return NULL;
111 +                }
112 +
113 +                fclose(f);
114 +        } else {
115                  return NULL;
116          }
89        if((sscanf(line_ptr, "page %lld %lld", &page_stats.pages_pagein, &page_stats.pages_pageout))!=2){
90                return NULL;
91        }
92        fclose(f);
93
117   #endif
118   #ifdef FREEBSD
119          size = sizeof page_stats.pages_pagein;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines