From nobody@FreeBSD.org  Wed Apr 28 17:13:24 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 79EB6106564A
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 Apr 2010 17:13:24 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 5EA748FC19
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 Apr 2010 17:13:24 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o3SHDOqe058412
	for <freebsd-gnats-submit@FreeBSD.org>; Wed, 28 Apr 2010 17:13:24 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o3SHDODL058411;
	Wed, 28 Apr 2010 17:13:24 GMT
	(envelope-from nobody)
Message-Id: <201004281713.o3SHDODL058411@www.freebsd.org>
Date: Wed, 28 Apr 2010 17:13:24 GMT
From: pluknet <pluknet@gmail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [patch] (attempt to) cleanup tools/tools/umastat
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         146119
>Category:       misc
>Synopsis:       [tools] [patch] (attempt to) cleanup tools/tools/umastat
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    avg
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Wed Apr 28 17:20:00 UTC 2010
>Closed-Date:    Tue Sep 21 05:38:08 UTC 2010
>Last-Modified:  Tue Sep 28 06:00:19 UTC 2010
>Originator:     pluknet
>Release:        HEAD r207204
>Organization:
>Environment:
>Description:
1) printf() modifiers on LP64
2) warning "dereferencing type-punned pointer will break strict-aliasing rules"
I had to change cast (struct bucketlist *) to (void *) to shut up this warning without much rewrite. *sigh
3) s/kvm_open/kvm_openfiles/;
when using kvm_open, kvm_nlist returns "No such file or directory".
that fixes this warning. I didn't find much difference umastat output.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: tools/tools/umastat/umastat.c
===================================================================
--- tools/tools/umastat/umastat.c	(revision 207204)
+++ tools/tools/umastat/umastat.c	(working copy)
@@ -37,6 +37,7 @@
 
 #include <err.h>
 #include <kvm.h>
+#include <limits.h>
 #include <memstat.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -196,7 +197,7 @@
 LIST_HEAD(bucketlist, uma_bucket);
 
 static void
-uma_print_bucket(struct uma_bucket *ubp, const char *spaces)
+uma_print_bucket(struct uma_bucket *ubp, const char *spaces __unused)
 {
 
 	printf("{ ub_cnt = %d, ub_entries = %d }", ubp->ub_cnt,
@@ -230,7 +231,7 @@
 	}
 
 	printf("\n");
-	printf("%s};  // total cnt %llu, total entries %llu\n", spaces,
+	printf("%s};  // total cnt %ju, total entries %ju\n", spaces,
 	    total_cnt, total_entries);
 }
 
@@ -242,8 +243,8 @@
 	int ret;
 
 	printf("%s%s[%d] = {\n", spaces, name, cpu);
-	printf("%s  uc_frees = %llu;\n", spaces, cache->uc_frees);
-	printf("%s  uc_allocs = %llu;\n", spaces, cache->uc_allocs);
+	printf("%s  uc_frees = %ju;\n", spaces, cache->uc_frees);
+	printf("%s  uc_allocs = %ju;\n", spaces, cache->uc_allocs);
 
 	if (cache->uc_freebucket != NULL) {
 		ret = kread(kvm, cache->uc_freebucket, &ub, sizeof(ub), 0);
@@ -286,6 +287,7 @@
 	size_t uzp_userspace_len;
 	char *memf, *nlistf;
 	int ch;
+	char errbuf[_POSIX2_LINE_MAX];
 
 	memf = nlistf = NULL;
 	while ((ch = getopt(argc, argv, "M:N:")) != -1) {
@@ -308,9 +310,9 @@
 	if (nlistf != NULL && memf == NULL)
 		usage();
 
-	kvm = kvm_open(nlistf, memf, NULL, 0, "umastat");
+	kvm = kvm_open(nlistf, memf, NULL, 0, errbuf);
 	if (kvm == NULL)
-		err(-1, "kvm_open");
+		errx(1, "kvm_openfiles: %s", errbuf);
 
 	if (kvm_nlist(kvm, namelist) != 0)
 		err(-1, "kvm_nlist");
@@ -412,20 +414,20 @@
 			}
 			printf("  Zone {\n");
 			printf("    uz_name = \"%s\";\n", name);
-			printf("    uz_allocs = %llu;\n",
+			printf("    uz_allocs = %ju;\n",
 			    uzp_userspace->uz_allocs);
-			printf("    uz_frees = %llu;\n",
+			printf("    uz_frees = %ju;\n",
 			    uzp_userspace->uz_frees);
-			printf("    uz_fails = %llu;\n",
+			printf("    uz_fails = %ju;\n",
 			    uzp_userspace->uz_fails);
 			printf("    uz_fills = %u;\n",
 			    uzp_userspace->uz_fills);
 			printf("    uz_count = %u;\n",
 			    uzp_userspace->uz_count);
-			uma_print_bucketlist(kvm, (struct bucketlist *)
+			uma_print_bucketlist(kvm, (void *)
 			    &uzp_userspace->uz_full_bucket, "uz_full_bucket",
 			    "    ");
-			uma_print_bucketlist(kvm, (struct bucketlist *)
+			uma_print_bucketlist(kvm, (void *)
 			    &uzp_userspace->uz_free_bucket, "uz_free_bucket",
 			    "    ");
 


>Release-Note:
>Audit-Trail:

From: pluknet <pluknet@gmail.com>
To: bug-followup@FreeBSD.org, pluknet@gmail.com
Cc:  
Subject: Re: misc/146119: [tools] [patch] (attempt to) cleanup tools/tools/umastat
Date: Tue, 21 Sep 2010 02:22:08 +0400

 --001636e8ff45d666230490b8570d
 Content-Type: text/plain; charset=ISO-8859-1
 
 Ok, after some related activity in head, I picked up
 this PR from my attic, and couldn't recall the way
 to reproduce the kvm_open() issue in ten minutes.
 Here are the instructions:
 
 1) before:
 # ./umastat -M /dev/mem > /dev/null
 umastat: kvm_nlist: No such file or directory
 umastat: kvm_nlist: No such file or directory
 umastat: kvm_nlist: No such file or directory
 umastat: kvm_nlist: No such file or directory
 
 2) after:
 # ./umastat -M /dev/mem > /dev/null
 #
 
 Somehow I managed to botch the original patch
 in PR to non-working state before submitting.
 The corrected version attached.
 
 -- 
 wbr,
 pluknet
 
 --001636e8ff45d666230490b8570d
 Content-Type: text/plain; charset=US-ASCII; name="umastat.txt"
 Content-Disposition: attachment; filename="umastat.txt"
 Content-Transfer-Encoding: base64
 X-Attachment-Id: f_gebwhjwl0
 
 SW5kZXg6IHRvb2xzL3Rvb2xzL3VtYXN0YXQvdW1hc3RhdC5jCj09PT09PT09PT09PT09PT09PT09
 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIHRvb2xz
 L3Rvb2xzL3VtYXN0YXQvdW1hc3RhdC5jCShyZXZpc2lvbiAyMDk5ODgpCisrKyB0b29scy90b29s
 cy91bWFzdGF0L3VtYXN0YXQuYwkod29ya2luZyBjb3B5KQpAQCAtMzcsNiArMzcsNyBAQAogCiAj
 aW5jbHVkZSA8ZXJyLmg+CiAjaW5jbHVkZSA8a3ZtLmg+CisjaW5jbHVkZSA8bGltaXRzLmg+CiAj
 aW5jbHVkZSA8bWVtc3RhdC5oPgogI2luY2x1ZGUgPHN0ZGlvLmg+CiAjaW5jbHVkZSA8c3RkbGli
 Lmg+CkBAIC0xOTYsNyArMTk3LDcgQEAKIExJU1RfSEVBRChidWNrZXRsaXN0LCB1bWFfYnVja2V0
 KTsKIAogc3RhdGljIHZvaWQKLXVtYV9wcmludF9idWNrZXQoc3RydWN0IHVtYV9idWNrZXQgKnVi
 cCwgY29uc3QgY2hhciAqc3BhY2VzKQordW1hX3ByaW50X2J1Y2tldChzdHJ1Y3QgdW1hX2J1Y2tl
 dCAqdWJwLCBjb25zdCBjaGFyICpzcGFjZXMgX191bnVzZWQpCiB7CiAKIAlwcmludGYoInsgdWJf
 Y250ID0gJWQsIHViX2VudHJpZXMgPSAlZCB9IiwgdWJwLT51Yl9jbnQsCkBAIC0yMzAsNyArMjMx
 LDcgQEAKIAl9CiAKIAlwcmludGYoIlxuIik7Ci0JcHJpbnRmKCIlc307ICAvLyB0b3RhbCBjbnQg
 JWxsdSwgdG90YWwgZW50cmllcyAlbGx1XG4iLCBzcGFjZXMsCisJcHJpbnRmKCIlc307ICAvLyB0
 b3RhbCBjbnQgJWp1LCB0b3RhbCBlbnRyaWVzICVqdVxuIiwgc3BhY2VzLAogCSAgICB0b3RhbF9j
 bnQsIHRvdGFsX2VudHJpZXMpOwogfQogCkBAIC0yNDIsOCArMjQzLDggQEAKIAlpbnQgcmV0Owog
 CiAJcHJpbnRmKCIlcyVzWyVkXSA9IHtcbiIsIHNwYWNlcywgbmFtZSwgY3B1KTsKLQlwcmludGYo
 IiVzICB1Y19mcmVlcyA9ICVsbHU7XG4iLCBzcGFjZXMsIGNhY2hlLT51Y19mcmVlcyk7Ci0JcHJp
 bnRmKCIlcyAgdWNfYWxsb2NzID0gJWxsdTtcbiIsIHNwYWNlcywgY2FjaGUtPnVjX2FsbG9jcyk7
 CisJcHJpbnRmKCIlcyAgdWNfZnJlZXMgPSAlanU7XG4iLCBzcGFjZXMsIGNhY2hlLT51Y19mcmVl
 cyk7CisJcHJpbnRmKCIlcyAgdWNfYWxsb2NzID0gJWp1O1xuIiwgc3BhY2VzLCBjYWNoZS0+dWNf
 YWxsb2NzKTsKIAogCWlmIChjYWNoZS0+dWNfZnJlZWJ1Y2tldCAhPSBOVUxMKSB7CiAJCXJldCA9
 IGtyZWFkKGt2bSwgY2FjaGUtPnVjX2ZyZWVidWNrZXQsICZ1Yiwgc2l6ZW9mKHViKSwgMCk7CkBA
 IC0yODYsNiArMjg3LDcgQEAKIAlzaXplX3QgdXpwX3VzZXJzcGFjZV9sZW47CiAJY2hhciAqbWVt
 ZiwgKm5saXN0ZjsKIAlpbnQgY2g7CisJY2hhciBlcnJidWZbX1BPU0lYMl9MSU5FX01BWF07CiAK
 IAltZW1mID0gbmxpc3RmID0gTlVMTDsKIAl3aGlsZSAoKGNoID0gZ2V0b3B0KGFyZ2MsIGFyZ3Ys
 ICJNOk46IikpICE9IC0xKSB7CkBAIC0zMDgsOSArMzEwLDkgQEAKIAlpZiAobmxpc3RmICE9IE5V
 TEwgJiYgbWVtZiA9PSBOVUxMKQogCQl1c2FnZSgpOwogCi0Ja3ZtID0ga3ZtX29wZW4obmxpc3Rm
 LCBtZW1mLCBOVUxMLCAwLCAidW1hc3RhdCIpOworCWt2bSA9IGt2bV9vcGVuZmlsZXMobmxpc3Rm
 LCBtZW1mLCBOVUxMLCAwLCBlcnJidWYpOwogCWlmIChrdm0gPT0gTlVMTCkKLQkJZXJyKC0xLCAi
 a3ZtX29wZW4iKTsKKwkJZXJyeCgtMSwgImt2bV9vcGVuZmlsZXM6ICVzIiwgZXJyYnVmKTsKIAog
 CWlmIChrdm1fbmxpc3Qoa3ZtLCBuYW1lbGlzdCkgIT0gMCkKIAkJZXJyKC0xLCAia3ZtX25saXN0
 Iik7CkBAIC00MTIsMjAgKzQxNCwyMCBAQAogCQkJfQogCQkJcHJpbnRmKCIgIFpvbmUge1xuIik7
 CiAJCQlwcmludGYoIiAgICB1el9uYW1lID0gXCIlc1wiO1xuIiwgbmFtZSk7Ci0JCQlwcmludGYo
 IiAgICB1el9hbGxvY3MgPSAlbGx1O1xuIiwKKwkJCXByaW50ZigiICAgIHV6X2FsbG9jcyA9ICVq
 dTtcbiIsCiAJCQkgICAgdXpwX3VzZXJzcGFjZS0+dXpfYWxsb2NzKTsKLQkJCXByaW50ZigiICAg
 IHV6X2ZyZWVzID0gJWxsdTtcbiIsCisJCQlwcmludGYoIiAgICB1el9mcmVlcyA9ICVqdTtcbiIs
 CiAJCQkgICAgdXpwX3VzZXJzcGFjZS0+dXpfZnJlZXMpOwotCQkJcHJpbnRmKCIgICAgdXpfZmFp
 bHMgPSAlbGx1O1xuIiwKKwkJCXByaW50ZigiICAgIHV6X2ZhaWxzID0gJWp1O1xuIiwKIAkJCSAg
 ICB1enBfdXNlcnNwYWNlLT51el9mYWlscyk7CiAJCQlwcmludGYoIiAgICB1el9maWxscyA9ICV1
 O1xuIiwKIAkJCSAgICB1enBfdXNlcnNwYWNlLT51el9maWxscyk7CiAJCQlwcmludGYoIiAgICB1
 el9jb3VudCA9ICV1O1xuIiwKIAkJCSAgICB1enBfdXNlcnNwYWNlLT51el9jb3VudCk7Ci0JCQl1
 bWFfcHJpbnRfYnVja2V0bGlzdChrdm0sIChzdHJ1Y3QgYnVja2V0bGlzdCAqKQorCQkJdW1hX3By
 aW50X2J1Y2tldGxpc3Qoa3ZtLCAodm9pZCAqKQogCQkJICAgICZ1enBfdXNlcnNwYWNlLT51el9m
 dWxsX2J1Y2tldCwgInV6X2Z1bGxfYnVja2V0IiwKIAkJCSAgICAiICAgICIpOwotCQkJdW1hX3By
 aW50X2J1Y2tldGxpc3Qoa3ZtLCAoc3RydWN0IGJ1Y2tldGxpc3QgKikKKwkJCXVtYV9wcmludF9i
 dWNrZXRsaXN0KGt2bSwgKHZvaWQgKikKIAkJCSAgICAmdXpwX3VzZXJzcGFjZS0+dXpfZnJlZV9i
 dWNrZXQsICJ1el9mcmVlX2J1Y2tldCIsCiAJCQkgICAgIiAgICAiKTsKIAo=
 --001636e8ff45d666230490b8570d--
Responsible-Changed-From-To: freebsd-bugs->avg 
Responsible-Changed-By: avg 
Responsible-Changed-When: Tue Sep 21 05:36:58 UTC 2010 
Responsible-Changed-Why:  
I am handling this 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146119 
State-Changed-From-To: open->closed 
State-Changed-By: avg 
State-Changed-When: Tue Sep 21 05:37:32 UTC 2010 
State-Changed-Why:  
The tool is patched in head, MFC will follow soon. 
Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146119 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/146119: commit references a PR
Date: Tue, 21 Sep 2010 05:36:36 +0000 (UTC)

 Author: avg
 Date: Tue Sep 21 05:36:30 2010
 New Revision: 212949
 URL: http://svn.freebsd.org/changeset/base/212949
 
 Log:
   tools/umastat: more cleanups
   
   PR:		misc/146119
   Submitted by:	pluknet <pluknet@gmail.com>
   MFC after:	1 week
 
 Modified:
   head/tools/tools/umastat/umastat.c
 
 Modified: head/tools/tools/umastat/umastat.c
 ==============================================================================
 --- head/tools/tools/umastat/umastat.c	Tue Sep 21 04:39:13 2010	(r212948)
 +++ head/tools/tools/umastat/umastat.c	Tue Sep 21 05:36:30 2010	(r212949)
 @@ -37,6 +37,7 @@
  
  #include <err.h>
  #include <kvm.h>
 +#include <limits.h>
  #include <memstat.h>
  #include <stdio.h>
  #include <stdlib.h>
 @@ -196,7 +197,7 @@ uma_print_keg_align(struct uma_keg *ukp,
  LIST_HEAD(bucketlist, uma_bucket);
  
  static void
 -uma_print_bucket(struct uma_bucket *ubp, const char *spaces)
 +uma_print_bucket(struct uma_bucket *ubp, const char *spaces __unused)
  {
  
  	printf("{ ub_cnt = %d, ub_entries = %d }", ubp->ub_cnt,
 @@ -286,6 +287,7 @@ main(int argc, char *argv[])
  	size_t uzp_userspace_len;
  	char *memf, *nlistf;
  	int ch;
 +	char errbuf[_POSIX2_LINE_MAX];
  
  	memf = nlistf = NULL;
  	while ((ch = getopt(argc, argv, "M:N:")) != -1) {
 @@ -308,9 +310,9 @@ main(int argc, char *argv[])
  	if (nlistf != NULL && memf == NULL)
  		usage();
  
 -	kvm = kvm_open(nlistf, memf, NULL, 0, "umastat");
 +	kvm = kvm_openfiles(nlistf, memf, NULL, 0, errbuf);
  	if (kvm == NULL)
 -		err(-1, "kvm_open");
 +		errx(-1, "kvm_openfiles: %s", errbuf);
  
  	if (kvm_nlist(kvm, namelist) != 0)
  		err(-1, "kvm_nlist");
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/146119: commit references a PR
Date: Tue, 28 Sep 2010 05:53:44 +0000 (UTC)

 Author: avg
 Date: Tue Sep 28 05:53:35 2010
 New Revision: 213242
 URL: http://svn.freebsd.org/changeset/base/213242
 
 Log:
   MFC r212932,212949: tools/umastat: fix build on amd64 and more
   
   PR:		misc/146119
 
 Modified:
   stable/8/tools/tools/umastat/umastat.c
 Directory Properties:
   stable/8/tools/tools/umastat/   (props changed)
 
 Modified: stable/8/tools/tools/umastat/umastat.c
 ==============================================================================
 --- stable/8/tools/tools/umastat/umastat.c	Tue Sep 28 04:57:56 2010	(r213241)
 +++ stable/8/tools/tools/umastat/umastat.c	Tue Sep 28 05:53:35 2010	(r213242)
 @@ -37,6 +37,7 @@
  
  #include <err.h>
  #include <kvm.h>
 +#include <limits.h>
  #include <memstat.h>
  #include <stdio.h>
  #include <stdlib.h>
 @@ -196,7 +197,7 @@ uma_print_keg_align(struct uma_keg *ukp,
  LIST_HEAD(bucketlist, uma_bucket);
  
  static void
 -uma_print_bucket(struct uma_bucket *ubp, const char *spaces)
 +uma_print_bucket(struct uma_bucket *ubp, const char *spaces __unused)
  {
  
  	printf("{ ub_cnt = %d, ub_entries = %d }", ubp->ub_cnt,
 @@ -230,7 +231,7 @@ uma_print_bucketlist(kvm_t *kvm, struct 
  	}
  
  	printf("\n");
 -	printf("%s};  // total cnt %llu, total entries %llu\n", spaces,
 +	printf("%s};  // total cnt %ju, total entries %ju\n", spaces,
  	    total_cnt, total_entries);
  }
  
 @@ -242,8 +243,8 @@ uma_print_cache(kvm_t *kvm, struct uma_c
  	int ret;
  
  	printf("%s%s[%d] = {\n", spaces, name, cpu);
 -	printf("%s  uc_frees = %llu;\n", spaces, cache->uc_frees);
 -	printf("%s  uc_allocs = %llu;\n", spaces, cache->uc_allocs);
 +	printf("%s  uc_frees = %ju;\n", spaces, cache->uc_frees);
 +	printf("%s  uc_allocs = %ju;\n", spaces, cache->uc_allocs);
  
  	if (cache->uc_freebucket != NULL) {
  		ret = kread(kvm, cache->uc_freebucket, &ub, sizeof(ub), 0);
 @@ -286,6 +287,7 @@ main(int argc, char *argv[])
  	size_t uzp_userspace_len;
  	char *memf, *nlistf;
  	int ch;
 +	char errbuf[_POSIX2_LINE_MAX];
  
  	memf = nlistf = NULL;
  	while ((ch = getopt(argc, argv, "M:N:")) != -1) {
 @@ -308,9 +310,9 @@ main(int argc, char *argv[])
  	if (nlistf != NULL && memf == NULL)
  		usage();
  
 -	kvm = kvm_open(nlistf, memf, NULL, 0, "umastat");
 +	kvm = kvm_openfiles(nlistf, memf, NULL, 0, errbuf);
  	if (kvm == NULL)
 -		err(-1, "kvm_open");
 +		errx(-1, "kvm_openfiles: %s", errbuf);
  
  	if (kvm_nlist(kvm, namelist) != 0)
  		err(-1, "kvm_nlist");
 @@ -412,20 +414,20 @@ main(int argc, char *argv[])
  			}
  			printf("  Zone {\n");
  			printf("    uz_name = \"%s\";\n", name);
 -			printf("    uz_allocs = %llu;\n",
 +			printf("    uz_allocs = %ju;\n",
  			    uzp_userspace->uz_allocs);
 -			printf("    uz_frees = %llu;\n",
 +			printf("    uz_frees = %ju;\n",
  			    uzp_userspace->uz_frees);
 -			printf("    uz_fails = %llu;\n",
 +			printf("    uz_fails = %ju;\n",
  			    uzp_userspace->uz_fails);
  			printf("    uz_fills = %u;\n",
  			    uzp_userspace->uz_fills);
  			printf("    uz_count = %u;\n",
  			    uzp_userspace->uz_count);
 -			uma_print_bucketlist(kvm, (struct bucketlist *)
 +			uma_print_bucketlist(kvm, (void *)
  			    &uzp_userspace->uz_full_bucket, "uz_full_bucket",
  			    "    ");
 -			uma_print_bucketlist(kvm, (struct bucketlist *)
 +			uma_print_bucketlist(kvm, (void *)
  			    &uzp_userspace->uz_free_bucket, "uz_free_bucket",
  			    "    ");
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: misc/146119: commit references a PR
Date: Tue, 28 Sep 2010 05:57:58 +0000 (UTC)

 Author: avg
 Date: Tue Sep 28 05:57:50 2010
 New Revision: 213243
 URL: http://svn.freebsd.org/changeset/base/213243
 
 Log:
   MFC r212932,212949: tools/umastat: fix build on amd64 and more
   
   PR:		misc/146119
 
 Modified:
   stable/7/tools/tools/umastat/umastat.c
 Directory Properties:
   stable/7/tools/tools/umastat/   (props changed)
 
 Modified: stable/7/tools/tools/umastat/umastat.c
 ==============================================================================
 --- stable/7/tools/tools/umastat/umastat.c	Tue Sep 28 05:53:35 2010	(r213242)
 +++ stable/7/tools/tools/umastat/umastat.c	Tue Sep 28 05:57:50 2010	(r213243)
 @@ -37,6 +37,7 @@
  
  #include <err.h>
  #include <kvm.h>
 +#include <limits.h>
  #include <memstat.h>
  #include <stdio.h>
  #include <stdlib.h>
 @@ -196,7 +197,7 @@ uma_print_keg_align(struct uma_keg *ukp,
  LIST_HEAD(bucketlist, uma_bucket);
  
  static void
 -uma_print_bucket(struct uma_bucket *ubp, const char *spaces)
 +uma_print_bucket(struct uma_bucket *ubp, const char *spaces __unused)
  {
  
  	printf("{ ub_cnt = %d, ub_entries = %d }", ubp->ub_cnt,
 @@ -230,7 +231,7 @@ uma_print_bucketlist(kvm_t *kvm, struct 
  	}
  
  	printf("\n");
 -	printf("%s};  // total cnt %llu, total entries %llu\n", spaces,
 +	printf("%s};  // total cnt %ju, total entries %ju\n", spaces,
  	    total_cnt, total_entries);
  }
  
 @@ -242,8 +243,8 @@ uma_print_cache(kvm_t *kvm, struct uma_c
  	int ret;
  
  	printf("%s%s[%d] = {\n", spaces, name, cpu);
 -	printf("%s  uc_frees = %llu;\n", spaces, cache->uc_frees);
 -	printf("%s  uc_allocs = %llu;\n", spaces, cache->uc_allocs);
 +	printf("%s  uc_frees = %ju;\n", spaces, cache->uc_frees);
 +	printf("%s  uc_allocs = %ju;\n", spaces, cache->uc_allocs);
  
  	if (cache->uc_freebucket != NULL) {
  		ret = kread(kvm, cache->uc_freebucket, &ub, sizeof(ub), 0);
 @@ -286,6 +287,7 @@ main(int argc, char *argv[])
  	size_t uzp_userspace_len;
  	char *memf, *nlistf;
  	int ch;
 +	char errbuf[_POSIX2_LINE_MAX];
  
  	memf = nlistf = NULL;
  	while ((ch = getopt(argc, argv, "M:N:")) != -1) {
 @@ -308,9 +310,9 @@ main(int argc, char *argv[])
  	if (nlistf != NULL && memf == NULL)
  		usage();
  
 -	kvm = kvm_open(nlistf, memf, NULL, 0, "umastat");
 +	kvm = kvm_openfiles(nlistf, memf, NULL, 0, errbuf);
  	if (kvm == NULL)
 -		err(-1, "kvm_open");
 +		errx(-1, "kvm_openfiles: %s", errbuf);
  
  	if (kvm_nlist(kvm, namelist) != 0)
  		err(-1, "kvm_nlist");
 @@ -412,20 +414,20 @@ main(int argc, char *argv[])
  			}
  			printf("  Zone {\n");
  			printf("    uz_name = \"%s\";\n", name);
 -			printf("    uz_allocs = %llu;\n",
 +			printf("    uz_allocs = %ju;\n",
  			    uzp_userspace->uz_allocs);
 -			printf("    uz_frees = %llu;\n",
 +			printf("    uz_frees = %ju;\n",
  			    uzp_userspace->uz_frees);
 -			printf("    uz_fails = %llu;\n",
 +			printf("    uz_fails = %ju;\n",
  			    uzp_userspace->uz_fails);
  			printf("    uz_fills = %u;\n",
  			    uzp_userspace->uz_fills);
  			printf("    uz_count = %u;\n",
  			    uzp_userspace->uz_count);
 -			uma_print_bucketlist(kvm, (struct bucketlist *)
 +			uma_print_bucketlist(kvm, (void *)
  			    &uzp_userspace->uz_full_bucket, "uz_full_bucket",
  			    "    ");
 -			uma_print_bucketlist(kvm, (struct bucketlist *)
 +			uma_print_bucketlist(kvm, (void *)
  			    &uzp_userspace->uz_free_bucket, "uz_free_bucket",
  			    "    ");
  
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
>Unformatted:
