[PATCH 21/56] perf tools: Add attr_update event name type

[Jiri Olsa]

Adding name type attr update event, that stores/transfer
events name. Event's name is stored within perf.data's
EVENT_DESC feature, but we don't have if we get report
data from pipe.

Link: http://lkml.kernel.org/n/tip-j8b9c0ev11zisop3qup1hdy8@xxxxxxxxxxxxxx
Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
---
 tools/perf/tests/attr_update.c | 24 ++++++++++++++++++++++++
 tools/perf/util/event.h        |  1 +
 tools/perf/util/header.c       | 21 +++++++++++++++++++++
 tools/perf/util/header.h       |  3 +++
 4 files changed, 49 insertions(+)

diff --git a/tools/perf/tests/attr_update.c b/tools/perf/tests/attr_update.c
index bb190d3aaefd..23ba1db9b2d4 100644
--- a/tools/perf/tests/attr_update.c
+++ b/tools/perf/tests/attr_update.c
@@ -29,10 +29,29 @@ static int process_event_scale(struct perf_tool *tool __maybe_unused,
 	return 0;
 }
 
+struct event_name {
+	struct perf_tool tool;
+	const char *name;
+};
+
+static int process_event_name(struct perf_tool *tool,
+			      union perf_event *event,
+			      struct perf_sample *sample __maybe_unused,
+			      struct machine *machine __maybe_unused)
+{
+	struct event_name *tmp = container_of(tool, struct event_name, tool);
+	struct attr_update_event *ev = (struct attr_update_event*) event;
+
+	TEST_ASSERT_VAL("wrong id", ev->id == 123);
+	TEST_ASSERT_VAL("wrong name", !strcmp(ev->str, tmp->name));
+	return 0;
+}
+
 int test__attr_update(void)
 {
 	struct perf_evlist *evlist;
 	struct perf_evsel *evsel;
+	struct event_name tmp;
 
 	evlist = perf_evlist__new_default();
 	TEST_ASSERT_VAL("failed to get evlist", evlist);
@@ -54,5 +73,10 @@ int test__attr_update(void)
 	TEST_ASSERT_VAL("failed to synthesize attr update scale",
 			!perf_event__synthesize_attr_update_scale(NULL, evsel, process_event_scale));
 
+	tmp.name = perf_evsel__name(evsel);
+
+	TEST_ASSERT_VAL("failed to synthesize attr update name",
+			!perf_event__synthesize_attr_update_name(&tmp.tool, evsel, process_event_name));
+
 	return 0;
 }
diff --git a/tools/perf/util/event.h b/tools/perf/util/event.h
index d9248975585b..88101c8fe0b1 100644
--- a/tools/perf/util/event.h
+++ b/tools/perf/util/event.h
@@ -286,6 +286,7 @@ struct attr_event {
 enum {
 	PERF_ATTR_UPDATE__UNIT  = 0,
 	PERF_ATTR_UPDATE__SCALE = 1,
+	PERF_ATTR_UPDATE__NAME  = 2,
 };
 
 struct attr_update_event {
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index a47ac44f6a59..2009f1fd1188 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -2741,6 +2741,24 @@ perf_event__synthesize_attr_update_scale(struct perf_tool *tool,
 	return err;
 }
 
+int
+perf_event__synthesize_attr_update_name(struct perf_tool *tool,
+					struct perf_evsel *evsel,
+					perf_event__handler_t process)
+{
+	struct attr_update_event *ev;
+	size_t len = strlen(evsel->name);
+	int err;
+
+	ev = attr_update_event__alloc(len + 1, PERF_ATTR_UPDATE__NAME, evsel->id[0]);
+	if (ev == NULL)
+		return -ENOMEM;
+
+	strncpy(ev->str, evsel->name, len);
+	err = process(tool, (union perf_event*) ev, NULL, NULL);
+	free(ev);
+	return err;
+}
 
 int perf_event__synthesize_attrs(struct perf_tool *tool,
 				   struct perf_session *session,
@@ -2822,6 +2840,9 @@ int perf_event__process_attr_update(struct perf_tool *tool __maybe_unused,
 	case PERF_ATTR_UPDATE__UNIT:
 		evsel->unit = strdup(ev->str);
 		break;
+	case PERF_ATTR_UPDATE__NAME:
+		evsel->name = strdup(ev->str);
+		break;
 	case PERF_ATTR_UPDATE__SCALE:
 		evsel->scale = ev->scale;
 	default:
diff --git a/tools/perf/util/header.h b/tools/perf/util/header.h
index 628ee46e14fd..cb538ade38d3 100644
--- a/tools/perf/util/header.h
+++ b/tools/perf/util/header.h
@@ -111,6 +111,9 @@ int perf_event__synthesize_attr_update_unit(struct perf_tool *tool,
 int perf_event__synthesize_attr_update_scale(struct perf_tool *tool,
 					     struct perf_evsel *evsel,
 					     perf_event__handler_t process);
+int perf_event__synthesize_attr_update_name(struct perf_tool *tool,
+					    struct perf_evsel *evsel,
+					    perf_event__handler_t process);
 int perf_event__process_attr(struct perf_tool *tool, union perf_event *event,
 			     struct perf_evlist **pevlist);
 int perf_event__process_attr_update(struct perf_tool *tool __maybe_unused,
-- 
2.4.3

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