Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 17 Nov 2013 14:07:01 +0000 (UTC)
From:      Alexander Motin <mav@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r258256 - head/tools/tools/umastat
Message-ID:  <201311171407.rAHE71XZ014817@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: mav
Date: Sun Nov 17 14:07:00 2013
New Revision: 258256
URL: http://svnweb.freebsd.org/changeset/base/258256

Log:
  Fix umastat build on present kernel.

Modified:
  head/tools/tools/umastat/umastat.c

Modified: head/tools/tools/umastat/umastat.c
==============================================================================
--- head/tools/tools/umastat/umastat.c	Sun Nov 17 10:16:56 2013	(r258255)
+++ head/tools/tools/umastat/umastat.c	Sun Nov 17 14:07:00 2013	(r258256)
@@ -117,7 +117,6 @@ static const struct flaginfo {
 	u_int32_t	 fi_flag;
 	const char	*fi_name;
 } flaginfo[] = {
-	{ UMA_ZFLAG_PRIVALLOC, "privalloc" },
 	{ UMA_ZFLAG_INTERNAL, "internal" },
 	{ UMA_ZFLAG_FULL, "full" },
 	{ UMA_ZFLAG_CACHEONLY, "cacheonly" },
@@ -364,14 +363,15 @@ main(int argc, char *argv[])
 		}
 		printf("Keg {\n");
 
-		printf("  uk_recurse = %d\n", kz.uk_recurse);
 		uma_print_keg_align(&kz, "  ");
 		printf("  uk_pages = %d\n", kz.uk_pages);
 		printf("  uk_free = %d\n", kz.uk_free);
+		printf("  uk_reserve = %d\n", kz.uk_reserve);
 		printf("  uk_size = %d\n", kz.uk_size);
 		printf("  uk_rsize = %d\n", kz.uk_rsize);
 		printf("  uk_maxpages = %d\n", kz.uk_maxpages);
 
+		printf("  uk_slabsize = %d\n", kz.uk_slabsize);
 		printf("  uk_pgoff = %d\n", kz.uk_pgoff);
 		printf("  uk_ppera = %d\n", kz.uk_ppera);
 		printf("  uk_ipers = %d\n", kz.uk_ipers);
@@ -414,21 +414,18 @@ main(int argc, char *argv[])
 			}
 			printf("  Zone {\n");
 			printf("    uz_name = \"%s\";\n", name);
-			printf("    uz_allocs = %ju;\n",
+			printf("    uz_allocs = %lu;\n",
 			    uzp_userspace->uz_allocs);
-			printf("    uz_frees = %ju;\n",
+			printf("    uz_frees = %lu;\n",
 			    uzp_userspace->uz_frees);
-			printf("    uz_fails = %ju;\n",
+			printf("    uz_fails = %lu;\n",
 			    uzp_userspace->uz_fails);
-			printf("    uz_fills = %u;\n",
-			    uzp_userspace->uz_fills);
+			printf("    uz_sleeps = %ju;\n",
+			    uzp_userspace->uz_sleeps);
 			printf("    uz_count = %u;\n",
 			    uzp_userspace->uz_count);
 			uma_print_bucketlist(kvm, (void *)
-			    &uzp_userspace->uz_full_bucket, "uz_full_bucket",
-			    "    ");
-			uma_print_bucketlist(kvm, (void *)
-			    &uzp_userspace->uz_free_bucket, "uz_free_bucket",
+			    &uzp_userspace->uz_buckets, "uz_buckets",
 			    "    ");
 
 			if (!(kz.uk_flags & UMA_ZFLAG_INTERNAL)) {



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201311171407.rAHE71XZ014817>