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

Comparing projects/libstatgrab/src/libstatgrab/swap_stats.c (file contents):
Revision 1.7 by ats, Sun Oct 19 02:03:02 2003 UTC vs.
Revision 1.13 by tdb, Fri Feb 13 16:46: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 29 | Line 32
32   #include <sys/swap.h>
33   #include <unistd.h>
34   #endif
35 < #ifdef LINUX
35 > #if defined(LINUX) || defined(CYGWIN)
36   #include <stdio.h>
37 + #include <string.h>
38   #endif
39   #ifdef FREEBSD
40   #include <unistd.h>
41   #include <sys/types.h>
42   #include <kvm.h>
43   #endif
44 + #if defined(NETBSD) || defined(OPENBSD)
45 + #include <sys/param.h>
46 + #include <uvm/uvm.h>
47 + #endif
48  
49   swap_stat_t *get_swap_stats(){
50  
# Line 46 | Line 54 | swap_stat_t *get_swap_stats(){
54          struct anoninfo ai;
55          int pagesize;
56   #endif
57 < #ifdef LINUX
57 > #if defined(LINUX) || defined(CYGWIN)
58          FILE *f;
59          char *line_ptr;
60 +        unsigned long long value;
61   #endif
62   #ifdef FREEBSD
63          struct kvm_swap swapinfo;
64          int pagesize;
65          kvm_t *kvmd;
66   #endif
67 < #ifdef NETBSD
67 > #if defined(NETBSD) || defined(OPENBSD)
68          struct uvmexp *uvm;
69   #endif
70  
# Line 70 | Line 79 | swap_stat_t *get_swap_stats(){
79          swap_stat.used = (long long)ai.ani_resv * (long long)pagesize;
80          swap_stat.free = swap_stat.total - swap_stat.used;
81   #endif
82 < #ifdef LINUX
83 <        if ((f=fopen("/proc/meminfo", "r" ))==NULL) {
82 > #if defined(LINUX) || defined(CYGWIN)
83 >        if ((f = fopen("/proc/meminfo", "r")) == NULL) {
84                  return NULL;
85          }
86 <        if((line_ptr=f_read_line(f, "Swap:"))==NULL){
87 <                fclose(f);
88 <                return NULL;
86 >
87 >        while ((line_ptr = f_read_line(f, "")) != NULL) {
88 >                if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
89 >                        continue;
90 >                }
91 >                value *= 1024;
92 >
93 >                if (strncmp(line_ptr, "SwapTotal:", 10) == 0) {
94 >                        swap_stat.total = value;
95 >                } else if (strncmp(line_ptr, "SwapFree:", 9) == 0) {
96 >                        swap_stat.free = value;
97 >                }
98          }
99 <        if((sscanf(line_ptr, "Swap: %lld %lld %lld", &swap_stat.total, &swap_stat.used, &swap_stat.free))!=3){
82 <                fclose(f);
83 <                return NULL;
84 <        }
99 >
100          fclose(f);
101 +        swap_stat.used = swap_stat.total - swap_stat.free;
102   #endif
103   #ifdef FREEBSD
104          if((kvmd = get_kvm()) == NULL){
# Line 97 | Line 113 | swap_stat_t *get_swap_stats(){
113          swap_stat.used = (long long)swapinfo.ksw_used * (long long)pagesize;
114          swap_stat.free = swap_stat.total-swap_stat.used;
115   #endif
116 < #ifdef NETBSD
116 > #if defined(NETBSD) || defined(OPENBSD)
117          if ((uvm = get_uvmexp()) == NULL) {
118                  return NULL;
119          }
# Line 106 | Line 122 | swap_stat_t *get_swap_stats(){
122          swap_stat.used = (long long)uvm->pagesize * (long long)uvm->swpginuse;
123          swap_stat.free = swap_stat.total - swap_stat.used;
124   #endif
125 +
126          return &swap_stat;
127  
128   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines