diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2018-05-30 22:03:02 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2018-05-30 22:03:02 +0000 |
| commit | 2708737d3818b85c4978e42b19c5709a56ab2ebc (patch) | |
| tree | 7e6927dc72b48521b7f87dcd501f211700da784b /usr.sbin/pmc | |
| parent | 1c97d64332b40e891cce9c9f763e12a314285b60 (diff) | |
pmc stat: fix format strings for 32-bit
Notes
Notes:
svn path=/head/; revision=334404
Diffstat (limited to 'usr.sbin/pmc')
| -rw-r--r-- | usr.sbin/pmc/Makefile | 1 | ||||
| -rw-r--r-- | usr.sbin/pmc/cmd_pmc_stat.c | 19 |
2 files changed, 9 insertions, 11 deletions
diff --git a/usr.sbin/pmc/Makefile b/usr.sbin/pmc/Makefile index fe4178457a2e..dcef3241a66b 100644 --- a/usr.sbin/pmc/Makefile +++ b/usr.sbin/pmc/Makefile @@ -9,5 +9,4 @@ LIBADD= kvm pmc m ncursesw pmcstat elf SRCS= pmc.c pmc_util.c cmd_pmc_stat.c -CWARNFLAGS.cmd_pmc_stat.c= -Wno-format .include <bsd.prog.mk> diff --git a/usr.sbin/pmc/cmd_pmc_stat.c b/usr.sbin/pmc/cmd_pmc_stat.c index 1f0a68922314..3b5eed347b05 100644 --- a/usr.sbin/pmc/cmd_pmc_stat.c +++ b/usr.sbin/pmc/cmd_pmc_stat.c @@ -271,23 +271,23 @@ pmc_stat_print_stat(struct rusage *ru) fprintf(pmc_args.pa_printfile, "%16ld %s\t#\t%02.03f M/sec\n", ru->ru_nivcsw, "involuntary csw", ((double)ru->ru_nivcsw / (double)ticks) / hz); - fprintf(pmc_args.pa_printfile, "%16ld %s\n", cvals[CYCLES], stat_mode_names[CYCLES]); - fprintf(pmc_args.pa_printfile, "%16ld %s\t\t#\t%01.03f inst/cycle\n", cvals[INST], stat_mode_names[INST], + fprintf(pmc_args.pa_printfile, "%16jd %s\n", (uintmax_t)cvals[CYCLES], stat_mode_names[CYCLES]); + fprintf(pmc_args.pa_printfile, "%16jd %s\t\t#\t%01.03f inst/cycle\n", (uintmax_t)cvals[INST], stat_mode_names[INST], (double)cvals[INST] / cvals[CYCLES]); - fprintf(pmc_args.pa_printfile, "%16ld %s\n", cvals[BR], stat_mode_names[BR]); + fprintf(pmc_args.pa_printfile, "%16jd %s\n", (uintmax_t)cvals[BR], stat_mode_names[BR]); if (stat_mode_names[BR_MISS] == pmc_stat_mode_names[BR_MISS]) - fprintf(pmc_args.pa_printfile, "%16ld %s\t\t#\t%.03f%%\n", - cvals[BR_MISS], stat_mode_names[BR_MISS], + fprintf(pmc_args.pa_printfile, "%16jd %s\t\t#\t%.03f%%\n", + (uintmax_t)cvals[BR_MISS], stat_mode_names[BR_MISS], 100 * ((double)cvals[BR_MISS] / cvals[BR])); else - fprintf(pmc_args.pa_printfile, "%16ld %s\n", - cvals[BR_MISS], stat_mode_names[BR_MISS]); - fprintf(pmc_args.pa_printfile, "%16ld %s%s", cvals[CACHE], stat_mode_names[CACHE], + fprintf(pmc_args.pa_printfile, "%16jd %s\n", + (uintmax_t)cvals[BR_MISS], stat_mode_names[BR_MISS]); + fprintf(pmc_args.pa_printfile, "%16jd %s%s", (uintmax_t)cvals[CACHE], stat_mode_names[CACHE], stat_mode_names[CACHE] != pmc_stat_mode_names[CACHE] ? "\n" : ""); if (stat_mode_names[CACHE] == pmc_stat_mode_names[CACHE]) fprintf(pmc_args.pa_printfile, "\t#\t%.03f refs/inst\n", ((double)cvals[CACHE] / cvals[INST])); - fprintf(pmc_args.pa_printfile, "%16ld %s%s", cvals[CACHE_MISS], stat_mode_names[CACHE_MISS], + fprintf(pmc_args.pa_printfile, "%16jd %s%s", (uintmax_t)cvals[CACHE_MISS], stat_mode_names[CACHE_MISS], stat_mode_names[CACHE_MISS] != pmc_stat_mode_names[CACHE_MISS] ? "\n" : ""); if (stat_mode_names[CACHE_MISS] == pmc_stat_mode_names[CACHE_MISS]) fprintf(pmc_args.pa_printfile, "\t\t#\t%.03f%%\n", @@ -297,7 +297,6 @@ pmc_stat_print_stat(struct rusage *ru) showtime(pmc_args.pa_printfile, &before_ts, &after, ru); } - static struct option longopts[] = { {"events", required_argument, NULL, 'j'}, {NULL, 0, NULL, 0} |