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.6 by ats, Sun Oct 19 00:25:30 2003 UTC vs.
Revision 1.11 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 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>
# Line 46 | Line 50 | swap_stat_t *get_swap_stats(){
50          struct anoninfo ai;
51          int pagesize;
52   #endif
53 < #ifdef LINUX
53 > #if defined(LINUX) || defined(CYGWIN)
54          FILE *f;
55          char *line_ptr;
56 +        unsigned long long value;
57   #endif
58   #ifdef FREEBSD
59          struct kvm_swap swapinfo;
60          int pagesize;
61          kvm_t *kvmd;
62   #endif
63 + #ifdef NETBSD
64 +        struct uvmexp *uvm;
65 + #endif
66  
67   #ifdef SOLARIS
68          if((pagesize=sysconf(_SC_PAGESIZE)) == -1){
# Line 67 | Line 75 | swap_stat_t *get_swap_stats(){
75          swap_stat.used = (long long)ai.ani_resv * (long long)pagesize;
76          swap_stat.free = swap_stat.total - swap_stat.used;
77   #endif
78 < #ifdef LINUX
79 <        if ((f=fopen("/proc/meminfo", "r" ))==NULL) {
78 > #if defined(LINUX) || defined(CYGWIN)
79 >        if ((f = fopen("/proc/meminfo", "r")) == NULL) {
80                  return NULL;
81          }
82 <        if((line_ptr=f_read_line(f, "Swap:"))==NULL){
83 <                fclose(f);
84 <                return NULL;
82 >
83 >        while ((line_ptr = f_read_line(f, "")) != NULL) {
84 >                if (sscanf(line_ptr, "%*s %llu kB", &value) != 1) {
85 >                        continue;
86 >                }
87 >                value *= 1024;
88 >
89 >                if (strncmp(line_ptr, "SwapTotal:", 10) == 0) {
90 >                        swap_stat.total = value;
91 >                } else if (strncmp(line_ptr, "SwapFree:", 9) == 0) {
92 >                        swap_stat.free = value;
93 >                }
94          }
95 <        if((sscanf(line_ptr, "Swap: %lld %lld %lld", &swap_stat.total, &swap_stat.used, &swap_stat.free))!=3){
79 <                fclose(f);
80 <                return NULL;
81 <        }
95 >
96          fclose(f);
97 +        swap_stat.used = swap_stat.total - swap_stat.free;
98   #endif
99   #ifdef FREEBSD
100          if((kvmd = get_kvm()) == NULL){
# Line 93 | Line 108 | swap_stat_t *get_swap_stats(){
108          swap_stat.total= (long long)swapinfo.ksw_total * (long long)pagesize;
109          swap_stat.used = (long long)swapinfo.ksw_used * (long long)pagesize;
110          swap_stat.free = swap_stat.total-swap_stat.used;
111 + #endif
112 + #ifdef NETBSD
113 +        if ((uvm = get_uvmexp()) == NULL) {
114 +                return NULL;
115 +        }
116 +
117 +        swap_stat.total = (long long)uvm->pagesize * (long long)uvm->swpages;
118 +        swap_stat.used = (long long)uvm->pagesize * (long long)uvm->swpginuse;
119 +        swap_stat.free = swap_stat.total - swap_stat.used;
120   #endif
121          return &swap_stat;
122  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines