diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2017-04-20 11:24:30 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2017-04-24 13:43:37 -0300 |
| commit | 9d43f5e8df6804ae271407500af9062e9278167a (patch) | |
| tree | 3564d53e2242beb9616ad050a6142de689cf814a /tools/perf/util/event.c | |
| parent | fb7b75619641d778c2b778748ca5cdf2718cc024 (diff) | |
| download | op-kernel-dev-9d43f5e8df6804ae271407500af9062e9278167a.zip op-kernel-dev-9d43f5e8df6804ae271407500af9062e9278167a.tar.gz | |
perf tools: Fix the code to strip command name
Recent commit broke command name strip in perf_event__get_comm_ids
function. It replaced left to right search for '\n' with rtrim, which
actually does right to left search. It occasionally caught earlier '\n'
and kept trash in the command name.
Keeping the ltrim, but moving back the left to right '\n' search
instead of the rtrim.
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Acked-by: Taeung Song <treeze.taeung@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Yao Jin <yao.jin@linux.intel.com>
Fixes: bdd97ca63faa ("perf tools: Refactor the code to strip command name with {l,r}trim()")
Link: http://lkml.kernel.org/r/20170420092430.29657-1-jolsa@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/event.c')
| -rw-r--r-- | tools/perf/util/event.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/tools/perf/util/event.c b/tools/perf/util/event.c index 2e829ac..142835c 100644 --- a/tools/perf/util/event.c +++ b/tools/perf/util/event.c @@ -141,8 +141,15 @@ static int perf_event__get_comm_ids(pid_t pid, char *comm, size_t len, ppids = strstr(bf, "PPid:"); if (name) { + char *nl; + name += 5; /* strlen("Name:") */ - name = rtrim(ltrim(name)); + name = ltrim(name); + + nl = strchr(name, '\n'); + if (nl) + *nl = '\0'; + size = strlen(name); if (size >= len) size = len - 1; |
