Commit 16251027 authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf evlist: Rename perf_evlist__remove() to evlist__remove() 



Rename perf_evlist__remove() to evlist__remove(), so we don't have a
name clash when we add perf_evlist__remove() in libperf.

Signed-off-by: default avatarJiri 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-14-jolsa@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a1cf3a75

tools/perf/builtin-inject.c

+2 −2
Original line number Diff line number Diff line
@@ -622,7 +622,7 @@ static void strip_fini(struct perf_inject *inject) 
		if (evsel->handler == drop_sample &&

		    ok_to_remove(evlist, evsel)) {

			pr_debug("Deleting %s\n", perf_evsel__name(evsel));

			perf_evlist__remove(evlist, evsel);

			evlist__remove(evlist, evsel);

			evsel__delete(evsel);

		}

	}
@@ -724,7 +724,7 @@ static int __cmd_inject(struct perf_inject *inject) 
			if (evsel) {

				pr_debug("Deleting %s\n",

					 perf_evsel__name(evsel));

				perf_evlist__remove(session->evlist, evsel);

				evlist__remove(session->evlist, evsel);

				evsel__delete(evsel);

			}

			if (inject->strip)

tools/perf/util/evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ void evlist__add(struct evlist *evlist, struct evsel *entry) 
	__perf_evlist__propagate_maps(evlist, entry);

}



void perf_evlist__remove(struct evlist *evlist, struct evsel *evsel)

void evlist__remove(struct evlist *evlist, struct evsel *evsel)

{

	evsel->evlist = NULL;

	list_del_init(&evsel->node);

tools/perf/util/evlist.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ void perf_evlist__exit(struct evlist *evlist); 
void evlist__delete(struct evlist *evlist);



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

void perf_evlist__remove(struct evlist *evlist, struct evsel *evsel);

void evlist__remove(struct evlist *evlist, struct evsel *evsel);



int __perf_evlist__add_default(struct evlist *evlist, bool precise);

CRA Git | Maintained and supported by SUSTech CRA and CCSE