Author: pfg
Date: Mon Jan 2 15:12:11 2017
New Revision: 311101
URL: https://svnweb.freebsd.org/changeset/base/311101
Log:
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)
MFC after: 2 weeks
Modified:
head/lib/libkvm/kvm.h
head/lib/libkvm/kvm_getswapinfo.3
head/lib/libkvm/kvm_getswapinfo.c
Modified: head/lib/libkvm/kvm.h
==============================================================================
--- head/lib/libkvm/kvm.h Mon Jan 2 12:54:12 2017 (r311100)
+++ head/lib/libkvm/kvm.h Mon Jan 2 15:12:11 2017 (r311101)
@@ -66,11 +66,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
Modified: head/lib/libkvm/kvm_getswapinfo.3
==============================================================================
--- head/lib/libkvm/kvm_getswapinfo.3 Mon Jan 2 12:54:12 2017
(r311100)
+++ head/lib/libkvm/kvm_getswapinfo.3 Mon Jan 2 15:12:11 2017
(r311101)
@@ -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 fi
.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
Modified: head/lib/libkvm/kvm_getswapinfo.c
==============================================================================
--- head/lib/libkvm/kvm_getswapinfo.c Mon Jan 2 12:54:12 2017
(r311100)
+++ head/lib/libkvm/kvm_getswapinfo.c Mon Jan 2 15:12:11 2017
(r311101)
@@ -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;
@@ -163,7 +164,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;
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
