Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1236539

[PATCH perf/core 2/5] [BUGFIX] perf-probe: Fix to remove dot suffix from second or latter events

Show all headers | View raw

Fix to remove dot suffix (e.g. .const, .isra) from
the second or latter events which has suffix numbers.

Since the previous commit 35a23ff928b0 ("perf probe: Cut
 off the gcc optimization postfixes from function name")
didn't care about the suffix numbered events, therefore
we'll have an error when we add additional events on the
same dot suffix functions.

e.g.
  ----
  # ./perf probe -f -a get_sigframe.isra.2.constprop.3 \
   -a get_sigframe.isra.2.constprop.3
  Failed to write event: Invalid argument
    Error: Failed to add events.
  ----

This fixes above issue as below:
  ----
  # ./perf probe -f -a get_sigframe.isra.2.constprop.3 \
   -a get_sigframe.isra.2.constprop.3
  Added new events:
    probe:get_sigframe   (on get_sigframe.isra.2.constprop.3)
    probe:get_sigframe_1 (on get_sigframe.isra.2.constprop.3)

  You can now use it in all perf tools, such as:

          perf record -e probe:get_sigframe_1 -aR sleep 1

  ----

Signed-off-by: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
---
 tools/perf/util/probe-event.c |   33 ++++++++++++++++++++-------------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/tools/perf/util/probe-event.c b/tools/perf/util/probe-event.c
index 7fb0533..7eb0239 100644
--- a/tools/perf/util/probe-event.c
+++ b/tools/perf/util/probe-event.c
@@ -2288,36 +2288,41 @@ static int get_new_event_name(char *buf, size_t len, const char *base,
 			      struct strlist *namelist, bool allow_suffix)
 {
 	int i, ret;
-	char *p;
+	char *p, *nbase;
 
 	if (*base == '.')
 		base++;
+	nbase = strdup(base);
+	if (!nbase)
+		return -ENOMEM;
+
+	/* Cut off the dot suffixes (e.g. .const, .isra)*/
+	p = strchr(nbase, '.');
+	if (p && p != nbase)
+		*p = '\0';
 
-	/* Try no suffix */
-	ret = e_snprintf(buf, len, "%s", base);
+	/* Try no suffix number */
+	ret = e_snprintf(buf, len, "%s", nbase);
 	if (ret < 0) {
 		pr_debug("snprintf() failed: %d\n", ret);
-		return ret;
+		goto out;
 	}
-	/* Cut off the postfixes (e.g. .const, .isra)*/
-	p = strchr(buf, '.');
-	if (p && p != buf)
-		*p = '\0';
 	if (!strlist__has_entry(namelist, buf))
-		return 0;
+		goto out;
 
 	if (!allow_suffix) {
 		pr_warning("Error: event \"%s\" already exists. "
-			   "(Use -f to force duplicates.)\n", base);
-		return -EEXIST;
+			   "(Use -f to force duplicates.)\n", buf);
+		ret = -EEXIST;
+		goto out;
 	}
 
 	/* Try to add suffix */
 	for (i = 1; i < MAX_EVENT_INDEX; i++) {
-		ret = e_snprintf(buf, len, "%s_%d", base, i);
+		ret = e_snprintf(buf, len, "%s_%d", nbase, i);
 		if (ret < 0) {
 			pr_debug("snprintf() failed: %d\n", ret);
-			return ret;
+			goto out;
 		}
 		if (!strlist__has_entry(namelist, buf))
 			break;
@@ -2327,6 +2332,8 @@ static int get_new_event_name(char *buf, size_t len, const char *base,
 		ret = -ERANGE;
 	}
 
+out:
+	free(nbase);
 	return ret;
 }
 

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH perf/core  0/5] perf-probe bugfixes Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
  [PATCH perf/core 5/5] perf-probe: Improve error message when  %return is on inlined function Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Improve error message when %return is on inlined function tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 3/5] [BUGFIX] perf-probe: Show correct source  lines of probes on kmodules Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Show correct source lines of probes on kmodules tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 4/5] [BUGFIX] perf-probe: Fix a segfault bug in  debuginfo_cache Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe: Fix a segfault bug in debuginfo_cache tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 2/5] [BUGFIX] perf-probe: Fix to remove dot suffix  from second or latter events Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Fix to remove dot suffix from second or latter events tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  [PATCH perf/core 1/5] [BUGFIX] perf-probe: Begin and end report  session correctly Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com> - 2015-09-30 18:50 +0200
    [tip:perf/core] perf probe:   Begin and end libdwfl report session correctly tip-bot for Masami Hiramatsu <tipbot@zytor.com> - 2015-10-01 09:20 +0200
  Re: [PATCH perf/core  0/5] perf-probe bugfixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2015-09-30 22:20 +0200

csiph-web