perf probe: Fix to remove dot suffix from second or latter events (663b1151) · Commits · 戴 / test

Fix to remove dot suffix (e.g. .const, .isra) from the second or latter events which has suffix numbers. Since the previous commit ("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> Tested-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Wang Nan <wangnan0@huawei.com> Link: http://lkml.kernel.org/r/20150930164130.3733.26573.stgit@localhost.localdomain Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/util/probe-event.c

+20 −13

Original line number	Diff line number	Diff line
		@@ -2289,36 +2289,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;
		@@ -2328,6 +2333,8 @@ static int get_new_event_name(char buf, size_t len, const char base,
		ret = -ERANGE;
		}

		out:
		free(nbase);
		return ret;
		}

Admin message