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-unsubscr...@freebsd.org"

Reply via email to