Commit 9ecae065 authored May 31, 2015 by Madhavan Srinivasan Committed by Arnaldo Carvalho de Melo Jun 01, 2015

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



The <fd979c01> 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.

Signed-off-by: Madhavan Srinivasan <maddy@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Michael Ellerman <mpe@ellerman.id.au>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Sukadev Bhattiprolu <sukadev@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/1433052383-21802-1-git-send-email-maddy@linux.vnet.ibm.com


[ Add spaces around operators ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 6bb536cc

tools/perf/util/pmu.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -112,7 +112,11 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias alias, char dir, char *
		if (sret < 0)
		goto error;

		if (scale[sret - 1] == '\n')
		scale[sret - 1] = '\0';
		else
		scale[sret] = '\0';

		/*
		* save current locale
		*/
		@@ -154,6 +158,9 @@ static int perf_pmu__parse_unit(struct perf_pmu_alias alias, char dir, char *n

		close(fd);

		if (alias->unit[sret - 1] == '\n')
		alias->unit[sret - 1] = '\0';
		else
		alias->unit[sret] = '\0';

		return 0;

Admin message