Author: mmacy
Date: Wed May 30 22:03:02 2018
New Revision: 334404
URL: https://svnweb.freebsd.org/changeset/base/334404
Log:
pmc stat: fix format strings for 32-bit
Modified:
head/usr.sbin/pmc/Makefile (contents, props changed)
head/usr.sbin/pmc/cmd_pmc_stat.c (contents, props changed)
Modified: head/usr.sbin/pmc/Makefile
==============================================================================
--- head/usr.sbin/pmc/Makefile Wed May 30 21:50:23 2018 (r334403)
+++ head/usr.sbin/pmc/Makefile Wed May 30 22:03:02 2018 (r334404)
@@ -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>
Modified: head/usr.sbin/pmc/cmd_pmc_stat.c
==============================================================================
--- head/usr.sbin/pmc/cmd_pmc_stat.c Wed May 30 21:50:23 2018
(r334403)
+++ head/usr.sbin/pmc/cmd_pmc_stat.c Wed May 30 22:03:02 2018
(r334404)
@@ -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",
@@ -296,7 +296,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'},
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
