From owner-svn-src-head@freebsd.org  Fri Mar 31 03:08:08 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id AC951D239CB;
 Fri, 31 Mar 2017 03:08:08 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 554C5CDF;
 Fri, 31 Mar 2017 03:08:08 +0000 (UTC)
 (envelope-from allanjude@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2V387Hw016612;
 Fri, 31 Mar 2017 03:08:07 GMT (envelope-from allanjude@FreeBSD.org)
Received: (from allanjude@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2V387RS016610;
 Fri, 31 Mar 2017 03:08:07 GMT (envelope-from allanjude@FreeBSD.org)
Message-Id: <201703310308.v2V387RS016610@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: allanjude set sender to
 allanjude@FreeBSD.org using -f
From: Allan Jude <allanjude@FreeBSD.org>
Date: Fri, 31 Mar 2017 03:08:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r316314 - in head/usr.bin: bsdiff/bsdiff top
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 31 Mar 2017 03:08:08 -0000

Author: allanjude
Date: Fri Mar 31 03:08:07 2017
New Revision: 316314
URL: https://svnweb.freebsd.org/changeset/base/316314

Log:
  fix top(1) ZFS compressed ARC support
  
  top(1) read the wrong amount of data from sysctl, uint64_t instead of
  boolean_t, resulting in the stats not showing in many cases.
  
  X-MFC-With:	r315435
  Sponsored by:	ScaleEngine Inc.

Modified:
  head/usr.bin/bsdiff/bsdiff/bsdiff.c
  head/usr.bin/top/machine.c

Modified: head/usr.bin/bsdiff/bsdiff/bsdiff.c
==============================================================================
--- head/usr.bin/bsdiff/bsdiff/bsdiff.c	Fri Mar 31 00:41:54 2017	(r316313)
+++ head/usr.bin/bsdiff/bsdiff/bsdiff.c	Fri Mar 31 03:08:07 2017	(r316314)
@@ -54,8 +54,12 @@ static off_t matchlen(u_char *old,off_t 
 {
 	off_t i;
 
-	for(i=0;(i<oldsize)&&(i<newsize);i++)
+printf("old=%p new=%p\n", old, new);
+//printf("oldsize=%ld newsize=%ld\n", oldsize, newsize);
+	for(i=0;(i<oldsize)&&(i<newsize);i++) {
+//printf("old[%ld] != new[%ld]\n", i, i);
 		if(old[i]!=new[i]) break;
+	}
 
 	return i;
 }
@@ -66,6 +70,9 @@ static off_t search(off_t *I,u_char *old
 	off_t x,y;
 
 	if(en-st<2) {
+printf("oldsize=%ld, newsize=%ld\n", oldsize, newsize);
+printf("x=matchlen(old, oldsize=%ld st=%ld I[st]=%ld, new, newsize=%ld)\n", oldsize-I[st], st, I[st], newsize);
+printf("y=matchlen(old, oldsize=%ld en=%ld I[en]=%ld, new, newsize=%ld)\n", oldsize-I[en], en, I[en], newsize);
 		x=matchlen(old+I[st],oldsize-I[st],new,newsize);
 		y=matchlen(old+I[en],oldsize-I[en],new,newsize);
 

Modified: head/usr.bin/top/machine.c
==============================================================================
--- head/usr.bin/top/machine.c	Fri Mar 31 00:41:54 2017	(r316313)
+++ head/usr.bin/top/machine.c	Fri Mar 31 03:08:07 2017	(r316314)
@@ -316,6 +316,7 @@ machine_init(struct statics *statics, ch
 {
 	int i, j, empty, pagesize;
 	uint64_t arc_size;
+	boolean_t carc_en;
 	size_t size;
 	struct passwd *pw;
 
@@ -327,9 +328,9 @@ machine_init(struct statics *statics, ch
 	    size != sizeof(smpmode))
 		smpmode = 0;
 
-	size = sizeof(arc_size);
-	if (sysctlbyname("vfs.zfs.compressed_arc_enabled", &arc_size, &size,
-	    NULL, 0) == 0 && arc_size == 1)
+	size = sizeof(carc_en);
+	if (sysctlbyname("vfs.zfs.compressed_arc_enabled", &carc_en, &size,
+	    NULL, 0) == 0 && carc_en == 1)
 		carc_enabled = 1;
 	size = sizeof(arc_size);
 	if (sysctlbyname("kstat.zfs.misc.arcstats.size", &arc_size, &size,