From: Jiri Olsa <jolsa@kernel.org>

Date: Sun, 21 Jul 2019 13:24:26 +0200

Subject: libperf: Add perf_evlist__add() function

Git-commit: 9a5edde6d3a6fb26101406534f7a5d09a9fcd362

Patch-mainline: v5.4-rc1

References: jsc#SLE-13661

​

Add the perf_evlist__add() function to add a perf_evsel in a perf_evlist

struct.

​

Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>

Cc: Alexey Budankov <alexey.budankov@linux.intel.com>

Cc: Andi Kleen <ak@linux.intel.com>

Cc: Michael Petlan <mpetlan@redhat.com>

Cc: Namhyung Kim <namhyung@kernel.org>

Cc: Peter Zijlstra <peterz@infradead.org>

Link: http://lkml.kernel.org/r/20190721112506.12306-40-jolsa@kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

Signed-off-by: Tony Jones <tonyj@suse.de>

---

 tools/perf/lib/evlist.c              | 7 +++++++

 tools/perf/lib/include/perf/evlist.h | 3 +++

 tools/perf/lib/libperf.map           | 1 +

 tools/perf/util/evlist.c             | 2 +-

 4 files changed, 12 insertions(+), 1 deletion(-)

​

diff --git a/tools/perf/lib/evlist.c b/tools/perf/lib/evlist.c

index fdc8c1894b37..e5f187fa4e57 100644

--- a/tools/perf/lib/evlist.c

+++ b/tools/perf/lib/evlist.c

@@ -2,8 +2,15 @@

 #include <perf/evlist.h>

 #include <linux/list.h>

 #include <internal/evlist.h>

+#include <internal/evsel.h>

 void perf_evlist__init(struct perf_evlist *evlist)

 {

    INIT_LIST_HEAD(&evlist->entries);

 }

+

+void perf_evlist__add(struct perf_evlist *evlist,

+             struct perf_evsel *evsel)

+{

+   list_add_tail(&evsel->node, &evlist->entries);

+}

diff --git a/tools/perf/lib/include/perf/evlist.h b/tools/perf/lib/include/perf/evlist.h

index 1ddfcca0bd01..6992568b14a0 100644

--- a/tools/perf/lib/include/perf/evlist.h

+++ b/tools/perf/lib/include/perf/evlist.h

@@ -5,7 +5,10 @@

 #include <perf/core.h>

 struct perf_evlist;

+struct perf_evsel;

 LIBPERF_API void perf_evlist__init(struct perf_evlist *evlist);

+LIBPERF_API void perf_evlist__add(struct perf_evlist *evlist,

+                 struct perf_evsel *evsel);

 #endif /* __LIBPERF_EVLIST_H */

diff --git a/tools/perf/lib/libperf.map b/tools/perf/lib/libperf.map

index 5ca6ff6fcdfa..06ccf31eb24d 100644

--- a/tools/perf/lib/libperf.map

+++ b/tools/perf/lib/libperf.map

@@ -11,6 +11,7 @@ LIBPERF_0.0.1 {

        perf_thread_map__put;

        perf_evsel__init;

        perf_evlist__init;

+       perf_evlist__add;

    local:

        *;

 };

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c

index f4aa6cf80559..f2b86f49ab8d 100644

--- a/tools/perf/util/evlist.c

+++ b/tools/perf/util/evlist.c

@@ -180,8 +180,8 @@ static void perf_evlist__propagate_maps(struct evlist *evlist)

 void evlist__add(struct evlist *evlist, struct evsel *entry)

 {

+   perf_evlist__add(&evlist->core, &entry->core);

    entry->evlist = evlist;

-   list_add_tail(&entry->core.node, &evlist->core.entries);

    entry->idx = evlist->nr_entries;

    entry->tracking = !entry->idx;

​

​