Skip to contentSkip to conversation

perf tools: Remove cast of non-variadic function to variadic

PATCH In review Michael Hudson-Doyle 3 participants 4 messages Oct 31, 2013 – Nov 4, 2013 perf events

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 perf tools: Remove cast of non-variadic function to variadic

4fb71074a570 (perf ui/hist: Consolidate hpp helpers) introduced a cast of percent_color_snprintf to a function pointer type with varargs. Change percent_color_snprintf to be variadic and remove the cast.

The symptom of this was all percentages being reported as 0.00% in perf report --stdio output.

---
 tools/perf/ui/hist.c    |  2 +-
 tools/perf/util/color.c | 11 +++++++++--
 tools/perf/util/color.h |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
tools/perf/ui/hist.c +1 -1
index 0a19328..78f4c92 100644
@@ -117,7 +117,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,		\
 			      struct perf_hpp *hpp, struct hist_entry *he) 	\
 {										\
 	return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%",			\
-			  (hpp_snprint_fn)percent_color_snprintf, true);	\
+			  percent_color_snprintf, true);			\
 }
 
 #define __HPP_ENTRY_PERCENT_FN(_type, _field)					\
tools/perf/util/color.c +9 -2
index 11e46da..66e44a5 100644
@@ -318,8 +318,15 @@ int percent_color_fprintf(FILE *fp, const char *fmt, double percent)
 	return r;
 }
 
-int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent)
+int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)
 {
-	const char *color = get_percent_color(percent);
+	va_list args;
+	double percent;
+	const char *color;
+
+	va_start(args, fmt);
+	percent = va_arg(args, double);
+	va_end(args);
+	color = get_percent_color(percent);
 	return color_snprintf(bf, size, color, fmt, percent);
 }
tools/perf/util/color.h +1 -1
index dea082b..fced384 100644
@@ -39,7 +39,7 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
 int color_snprintf(char *bf, size_t size, const char *color, const char *fmt, ...);
 int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
-int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent);
+int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...);
 int percent_color_fprintf(FILE *fp, const char *fmt, double percent);
 const char *get_percent_color(double percent);
 
Signature · 1 line
1.8.3.2
#1 lore raw

Em Thu, Oct 31, 2013 at 04:47:45PM -0700, Michael Hudson-Doyle escreveu:

Quoted 4 lines
tools/perf/util/color.c +1 -2
-int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent)
+int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)
 {
-	const char *color = get_percent_color(percent);

tools/perf/util/color.c int percent_color_fprintf(FILE *fp, const char *fmt, double percent) · line 332

Quoted 10 lines
tools/perf/util/color.c +8 -0
+	va_list args;
+	double percent;
+	const char *color;
+
+	va_start(args, fmt);
+	percent = va_arg(args, double);
+	va_end(args);
+	color = get_percent_color(percent);
 	return color_snprintf(bf, size, color, fmt, percent);
 }

As a bug fix I'm merging this now, but I wonder if, since we're doing the va_start/end dance here, can't we call some color_vsnprintf variant so as to avoid doing it twice?

I'll look into that after going thru more urgent stuff.

- Arnaldo

#2 lore raw
Quoted 11 lines · Arnaldo Carvalho de Melo

Em Thu, Oct 31, 2013 at 04:47:45PM -0700, Michael Hudson-Doyle escreveu:

Quoted 10 lines
tools/perf/util/color.c +7 -2
-int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent)
+int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)
 {
-	const char *color = get_percent_color(percent);
+	va_list args;
+	double percent;
+	const char *color;
+
+	va_start(args, fmt);
+	percent = va_arg(args, double);
Quoted 8 lines

tools/perf/util/color.c int percent_color_fprintf(FILE *fp, const char *fmt, double percent) · line 332

Quoted 4 lines
tools/perf/util/color.c +2 -0
+	va_end(args);
+	color = get_percent_color(percent);
 	return color_snprintf(bf, size, color, fmt, percent);
 }

As a bug fix I'm merging this now, but I wonder if, since we're doing the va_start/end dance here, can't we call some color_vsnprintf variant so as to avoid doing it twice?

I thought that, but we need to get the percent argument anyway. I couldn't decide if it was better to call color_vsnprintf with args or color_snprintf with percent so I went for the laziest option / minimal diff. Can clearly write a patch for the alternative if you like...

Quoted 1 line

I'll look into that after going thru more urgent stuff.

Thanks!

Cheers,
mwh

#3 lore raw
In reply to Michael Hudson-Doyle
perf tools: Remove cast of non-variadic function to variadic
Commit-ID:  53805eca3d89b095062c11a6798689bb0af09216
Gitweb:     http://git.kernel.org/tip/53805eca3d89b095062c11a6798689bb0af09216
Author:     Michael Hudson-Doyle <[email protected]>
AuthorDate: Thu, 31 Oct 2013 16:47:45 -0700
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 1 Nov 2013 10:40:51 -0300

perf tools: Remove cast of non-variadic function to variadic

The 4fb71074a570 (perf ui/hist: Consolidate hpp helpers) cset introduced a cast of percent_color_snprintf to a function pointer type with varargs. Change percent_color_snprintf to be variadic and remove the cast.

The symptom of this was all percentages being reported as 0.00% in perf report --stdio output on the armhf arch.

---
 tools/perf/ui/hist.c    |  2 +-
 tools/perf/util/color.c | 11 +++++++++--
 tools/perf/util/color.h |  2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)
tools/perf/ui/hist.c +1 -1
index 0a19328..78f4c92 100644
@@ -117,7 +117,7 @@ static int hpp__color_##_type(struct perf_hpp_fmt *fmt __maybe_unused,		\
 			      struct perf_hpp *hpp, struct hist_entry *he) 	\
 {										\
 	return __hpp__fmt(hpp, he, he_get_##_field, " %6.2f%%",			\
-			  (hpp_snprint_fn)percent_color_snprintf, true);	\
+			  percent_color_snprintf, true);			\
 }
 
 #define __HPP_ENTRY_PERCENT_FN(_type, _field)					\
tools/perf/util/color.c +9 -2
index 11e46da..66e44a5 100644
@@ -318,8 +318,15 @@ int percent_color_fprintf(FILE *fp, const char *fmt, double percent)
 	return r;
 }
 
-int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent)
+int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...)
 {
-	const char *color = get_percent_color(percent);
+	va_list args;
+	double percent;
+	const char *color;
+
+	va_start(args, fmt);
+	percent = va_arg(args, double);
+	va_end(args);
+	color = get_percent_color(percent);
 	return color_snprintf(bf, size, color, fmt, percent);
 }
tools/perf/util/color.h +1 -1
index dea082b..fced384 100644
@@ -39,7 +39,7 @@ int color_fprintf(FILE *fp, const char *color, const char *fmt, ...);
 int color_snprintf(char *bf, size_t size, const char *color, const char *fmt, ...);
 int color_fprintf_ln(FILE *fp, const char *color, const char *fmt, ...);
 int color_fwrite_lines(FILE *fp, const char *color, size_t count, const char *buf);
-int percent_color_snprintf(char *bf, size_t size, const char *fmt, double percent);
+int percent_color_snprintf(char *bf, size_t size, const char *fmt, ...);
 int percent_color_fprintf(FILE *fp, const char *fmt, double percent);
 const char *get_percent_color(double percent);