Date: Sat, 4 Jan 2014 23:45:55 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r260307 - stable/10/tools/tools/umastat Message-ID: <201401042345.s04Njt8j064786@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Sat Jan 4 23:45:55 2014 New Revision: 260307 URL: http://svnweb.freebsd.org/changeset/base/260307 Log: MFC r258256, r258390: Fix umastat build on present kernel. Modified: stable/10/tools/tools/umastat/umastat.c Directory Properties: stable/10/ (props changed) Modified: stable/10/tools/tools/umastat/umastat.c ============================================================================== --- stable/10/tools/tools/umastat/umastat.c Sat Jan 4 23:43:18 2014 (r260306) +++ stable/10/tools/tools/umastat/umastat.c Sat Jan 4 23:45:55 2014 (r260307) @@ -117,7 +117,9 @@ static const struct flaginfo { u_int32_t fi_flag; const char *fi_name; } flaginfo[] = { - { UMA_ZFLAG_PRIVALLOC, "privalloc" }, + { UMA_ZFLAG_MULTI, "multi" }, + { UMA_ZFLAG_DRAINING, "draining" }, + { UMA_ZFLAG_BUCKET, "bucket" }, { UMA_ZFLAG_INTERNAL, "internal" }, { UMA_ZFLAG_FULL, "full" }, { UMA_ZFLAG_CACHEONLY, "cacheonly" }, @@ -133,6 +135,10 @@ static const struct flaginfo { { UMA_ZONE_SECONDARY, "secondary" }, { UMA_ZONE_REFCNT, "refcnt" }, { UMA_ZONE_MAXBUCKET, "maxbucket" }, + { UMA_ZONE_CACHESPREAD, "cachespread" }, + { UMA_ZONE_VTOSLAB, "vtoslab" }, + { UMA_ZONE_NODUMP, "nodump" }, + { UMA_ZONE_PCPU, "pcpu" }, }; static const int flaginfo_count = sizeof(flaginfo) / sizeof(struct flaginfo); @@ -364,14 +370,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 +421,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?201401042345.s04Njt8j064786>