Skip to contentSkip to conversation

perf/tool: remove newline char when reading event scale and unit

PATCH In review Madhavan Srinivasan 3 participants 3 messages May 31, 2015 – Jun 4, 2015 perf events

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perf/tool: remove newline char when reading event scale and unit

commit <fd979c013207> intruduced perf_event_sysfs_show function to display event_str value of an attr in kernel/event/core.c. But the function returns the value with a newline char. So, if a event also carries a event.unit file, when printing the counter data perf tool formatting goes for a spin. That is, because of the event unit, event name is printed in the newline because of perf_event_sysfs_show returns with a newline char.

Now fixing perf core will break API, hencing proposing a fix in the perf tool.

Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Sukadev Bhattiprolu <[email protected]>
Cc Michael Ellerman <[email protected]>
---
 tools/perf/util/pmu.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/perf/util/pmu.c +9 -2
index 4841167..cf2cb34 100644
@@ -112,7 +112,11 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *
 	if (sret < 0)
 		goto error;
 
-	scale[sret] = '\0';
+	if (scale[sret-1] == '\n')
+		scale[sret-1] = '\0';
+	else
+		scale[sret] = '\0';
+
 	/*
 	 * save current locale
 	 */
@@ -154,7 +158,10 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
 
 	close(fd);
 
-	alias->unit[sret] = '\0';
+	if (alias->unit[sret-1] == '\n')
+		alias->unit[sret-1] = '\0';
+	else
+		alias->unit[sret] = '\0';
 
 	return 0;
 error:
Signature · 1 line
1.9.1
#1 lore raw

Em Sun, May 31, 2015 at 11:36:23AM +0530, Madhavan Srinivasan escreveu:

Quoted 8 lines

commit <fd979c013207> intruduced perf_event_sysfs_show function to display event_str value of an attr in kernel/event/core.c. But the function returns the value with a newline char. So, if a event also carries a event.unit file, when printing the counter data perf tool formatting goes for a spin. That is, because of the event unit, event name is printed in the newline because of perf_event_sysfs_show returns with a newline char.

Now fixing perf core will break API, hencing proposing a fix in the perf tool.

Looks sensible, but please next time add spaces around operators, doing it this time.

I.e., it should be:

		scale[sret - 1] = '\0';

Thanks,

- Arnaldo

Quoted 22 lines
tools/perf/util/pmu.c +9 -1
+	if (scale[sret-1] == '\n')
+		scale[sret-1] = '\0';
+	else
+		scale[sret] = '\0';
+
 	/*
 	 * save current locale
 	 */
@@ -154,7 +158,10 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
 
 	close(fd);
 
-	alias->unit[sret] = '\0';
+	if (alias->unit[sret-1] == '\n')
+		alias->unit[sret-1] = '\0';
+	else
+		alias->unit[sret] = '\0';
 
 	return 0;
 error:
Signature · 1 line
1.9.1
#2 lore raw

[tip:perf/core] perf tools: Remove newline char when reading event scale and unit

In reply to Madhavan Srinivasan
perf tools: Remove newline char when reading event scale and unit
Commit-ID:  9ecae065f3295d7ea5e1c5492170a848ca255a46
Gitweb:     http://git.kernel.org/tip/9ecae065f3295d7ea5e1c5492170a848ca255a46
Author:     Madhavan Srinivasan <[email protected]>
AuthorDate: Sun, 31 May 2015 11:36:23 +0530
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Mon, 1 Jun 2015 10:26:19 -0300

perf tools: Remove newline char when reading event scale and unit

The <fd979c013207> commit intruduced the perf_event_sysfs_show function to display the event_str value of an attr in kernel/event/core.c. But the function returns the value with a newline char.

So, if a event also carries a event.unit file, when printing the counter data perf tool formatting goes for a spin.

That is, because of the event unit, event name is printed in the newline because of perf_event_sysfs_show returns with a newline char.

Now fixing perf core will break API, hencing proposing a fix in the perf tool.

Cc Jiri Olsa <[email protected]>
Cc Michael Ellerman <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Sukadev Bhattiprolu <[email protected]>
[ Add spaces around operators ]
---
 tools/perf/util/pmu.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)
tools/perf/util/pmu.c +9 -2
index 5d3ab7c..0fcc624 100644
@@ -112,7 +112,11 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *
 	if (sret < 0)
 		goto error;
 
-	scale[sret] = '\0';
+	if (scale[sret - 1] == '\n')
+		scale[sret - 1] = '\0';
+	else
+		scale[sret] = '\0';
+
 	/*
 	 * save current locale
 	 */
@@ -154,7 +158,10 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias *alias, char *dir, char *n
 
 	close(fd);
 
-	alias->unit[sret] = '\0';
+	if (alias->unit[sret - 1] == '\n')
+		alias->unit[sret - 1] = '\0';
+	else
+		alias->unit[sret] = '\0';
 
 	return 0;
 error: