[PATCH 30/37] perf intel-pt: Factor out intel_pt_set_event_name()

2017-05-19 Thread Adrian Hunter
Factor out intel_pt_set_event_name() so it can be reused.

Signed-off-by: Adrian Hunter 
---
 tools/perf/util/intel-pt.c | 24 
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 81907f60e7da..a20712e1ed28 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1931,6 +1931,21 @@ static int intel_pt_synth_event(struct perf_session 
*session, const char *name,
return err;
 }
 
+static void intel_pt_set_event_name(struct perf_evlist *evlist, u64 id,
+   const char *name)
+{
+   struct perf_evsel *evsel;
+
+   evlist__for_each_entry(evlist, evsel) {
+   if (evsel->id && evsel->id[0] == id) {
+   if (evsel->name)
+   zfree(>name);
+   evsel->name = strdup(name);
+   break;
+   }
+   }
+}
+
 static struct perf_evsel *intel_pt_evsel(struct intel_pt *pt,
 struct perf_evlist *evlist)
 {
@@ -2015,15 +2030,8 @@ static int intel_pt_synth_events(struct intel_pt *pt,
pt->sample_transactions = true;
pt->transactions_sample_type = attr.sample_type;
pt->transactions_id = id;
+   intel_pt_set_event_name(evlist, id, "transactions");
id += 1;
-   evlist__for_each_entry(evlist, evsel) {
-   if (evsel->id && evsel->id[0] == pt->transactions_id) {
-   if (evsel->name)
-   zfree(>name);
-   evsel->name = strdup("transactions");
-   break;
-   }
-   }
}
 
if (pt->synth_opts.branches) {
-- 
1.9.1



[PATCH 30/37] perf intel-pt: Factor out intel_pt_set_event_name()

2017-05-19 Thread Adrian Hunter
Factor out intel_pt_set_event_name() so it can be reused.

Signed-off-by: Adrian Hunter 
---
 tools/perf/util/intel-pt.c | 24 
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/tools/perf/util/intel-pt.c b/tools/perf/util/intel-pt.c
index 81907f60e7da..a20712e1ed28 100644
--- a/tools/perf/util/intel-pt.c
+++ b/tools/perf/util/intel-pt.c
@@ -1931,6 +1931,21 @@ static int intel_pt_synth_event(struct perf_session 
*session, const char *name,
return err;
 }
 
+static void intel_pt_set_event_name(struct perf_evlist *evlist, u64 id,
+   const char *name)
+{
+   struct perf_evsel *evsel;
+
+   evlist__for_each_entry(evlist, evsel) {
+   if (evsel->id && evsel->id[0] == id) {
+   if (evsel->name)
+   zfree(>name);
+   evsel->name = strdup(name);
+   break;
+   }
+   }
+}
+
 static struct perf_evsel *intel_pt_evsel(struct intel_pt *pt,
 struct perf_evlist *evlist)
 {
@@ -2015,15 +2030,8 @@ static int intel_pt_synth_events(struct intel_pt *pt,
pt->sample_transactions = true;
pt->transactions_sample_type = attr.sample_type;
pt->transactions_id = id;
+   intel_pt_set_event_name(evlist, id, "transactions");
id += 1;
-   evlist__for_each_entry(evlist, evsel) {
-   if (evsel->id && evsel->id[0] == pt->transactions_id) {
-   if (evsel->name)
-   zfree(>name);
-   evsel->name = strdup("transactions");
-   break;
-   }
-   }
}
 
if (pt->synth_opts.branches) {
-- 
1.9.1