svn commit: r319982 - stable/11/usr.bin/top

[Allan Jude]

Author: allanjude
Date: Thu Jun 15 17:43:40 2017
New Revision: 319982
URL: https://svnweb.freebsd.org/changeset/base/319982

Log:
  MFC: r319866, r319867
  	top: Change the way the ZFS ARC compression ratio is calculated
  	remove overhead statistics, already included in other counters
  
  Approved by:	re (gjb)

Modified:
  stable/11/usr.bin/top/machine.c
  stable/11/usr.bin/top/top.local.1
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/top/machine.c
==============================================================================
--- stable/11/usr.bin/top/machine.c	Thu Jun 15 17:06:04 2017	(r319981)
+++ stable/11/usr.bin/top/machine.c	Thu Jun 15 17:43:40 2017	(r319982)
@@ -188,9 +188,9 @@ char *arcnames[] = {
 	NULL
 };
 
-int carc_stats[5];
+int carc_stats[4];
 char *carcnames[] = {
-	"K Compressed, ", "K Uncompressed, ", ":1 Ratio, ", "K Overhead",
+	"K Compressed, ", "K Uncompressed, ", ":1 Ratio, ",
 	NULL
 };
 
@@ -580,11 +580,9 @@ get_system_info(struct system_info *si)
 	if (carc_enabled) {
 		GETSYSCTL("kstat.zfs.misc.arcstats.compressed_size", arc_stat);
 		carc_stats[0] = arc_stat >> 10;
+		carc_stats[2] = arc_stat >> 10; /* For ratio */
 		GETSYSCTL("kstat.zfs.misc.arcstats.uncompressed_size", arc_stat);
 		carc_stats[1] = arc_stat >> 10;
-		carc_stats[2] = arc_stats[0]; /* ARC Total */
-		GETSYSCTL("kstat.zfs.misc.arcstats.overhead_size", arc_stat);
-		carc_stats[3] = arc_stat >> 10;
 		si->carc = carc_stats;
 	}
 

Modified: stable/11/usr.bin/top/top.local.1
==============================================================================
--- stable/11/usr.bin/top/top.local.1	Thu Jun 15 17:06:04 2017	(r319981)
+++ stable/11/usr.bin/top/top.local.1	Thu Jun 15 17:43:40 2017	(r319982)
@@ -65,10 +65,7 @@ bytes of memory used by ARC caches
 bytes of data stored in ARC caches before compression
 .TP
 .B Ratio:
-ratio of uncompressed data to total ARC size
-.TP
-.B Overhead:
-amount of overhead from ARC compression
+compression ratio of data cached in the ARC
 .SS Swap Stats
 .TP
 .B Total: