]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
perf tools: Fix the code to strip command name
authorJiri Olsa <jolsa@kernel.org>
Thu, 20 Apr 2017 09:24:30 +0000 (11:24 +0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 24 Apr 2017 16:43:37 +0000 (13:43 -0300)
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>
tools/perf/util/event.c

index 2e829ac0f615c3f8a31338d3b89b7bbeced5fb91..142835c0ca0a7dd76b1e7106b32dc60d63384c83 100644 (file)
@@ -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;