summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfg <pfg@FreeBSD.org>2017-01-16 03:52:20 +0000
committerpfg <pfg@FreeBSD.org>2017-01-16 03:52:20 +0000
commit5930c52da241f431eb4695694a580ae4a4147fef (patch)
treeadd06d9ea9350fc442a2749f6473d7d2bae7a109
parentb5573453d3e4a54bbc4180829e9550106f4387c0 (diff)
downloadFreeBSD-src-5930c52da241f431eb4695694a580ae4a4147fef.zip
FreeBSD-src-5930c52da241f431eb4695694a580ae4a4147fef.tar.gz
MFC r311101:
libkvm - extend a bit the swap statistics field. Change ksw_used and ksw_total to unsigned, which increases the maximum total swap that can be displayed properly from ~8TB to ~16TB. Obtained from: DragonflyBSD (ecc2e461)
-rw-r--r--lib/libkvm/kvm.h8
-rw-r--r--lib/libkvm/kvm_getswapinfo.36
-rw-r--r--lib/libkvm/kvm_getswapinfo.c6
3 files changed, 11 insertions, 9 deletions
diff --git a/lib/libkvm/kvm.h b/lib/libkvm/kvm.h
index d697795..6c2b102 100644
--- a/lib/libkvm/kvm.h
+++ b/lib/libkvm/kvm.h
@@ -58,11 +58,11 @@ struct proc;
struct kvm_swap {
char ksw_devname[32];
- int ksw_used;
- int ksw_total;
+ u_int ksw_used;
+ u_int ksw_total;
int ksw_flags;
- int ksw_reserved1;
- int ksw_reserved2;
+ u_int ksw_reserved1;
+ u_int ksw_reserved2;
};
#define SWIF_DEV_PREFIX 0x0002
diff --git a/lib/libkvm/kvm_getswapinfo.3 b/lib/libkvm/kvm_getswapinfo.3
index edd2068..bb4e67e 100644
--- a/lib/libkvm/kvm_getswapinfo.3
+++ b/lib/libkvm/kvm_getswapinfo.3
@@ -23,7 +23,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd January 22, 1999
+.Dd January 2, 2017
.Dt KVM_SWAPINFO 3
.Os
.Sh NAME
@@ -78,9 +78,9 @@ This structure contains the following fields:
.It
.Va char ksw_devname[] ;
.It
-.Va int ksw_total ;
+.Va u_int ksw_total ;
.It
-.Va int ksw_used ;
+.Va u_int ksw_used ;
.It
.Va int ksw_flags ;
.El
diff --git a/lib/libkvm/kvm_getswapinfo.c b/lib/libkvm/kvm_getswapinfo.c
index d79d70c..7d9c8a9 100644
--- a/lib/libkvm/kvm_getswapinfo.c
+++ b/lib/libkvm/kvm_getswapinfo.c
@@ -112,7 +112,8 @@ int
kvm_getswapinfo_kvm(kvm_t *kd, struct kvm_swap *swap_ary, int swap_max,
int flags)
{
- int i, ttl;
+ int i;
+ swblk_t ttl;
TAILQ_HEAD(, swdevt) swtailq;
struct swdevt *sp, swinfo;
struct kvm_swap tot;
@@ -157,7 +158,8 @@ int
kvm_getswapinfo_sysctl(kvm_t *kd, struct kvm_swap *swap_ary, int swap_max,
int flags)
{
- int ti, ttl;
+ int ti;
+ swblk_t ttl;
size_t mibi, len;
int soid[SWI_MAXMIB];
struct xswdev xsd;
OpenPOWER on IntegriCloud