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

perf evlist: Rename perf_evlist__add() to evlist__add() 



Rename perf_evlist__add() to evlist__add(), so we don't have a name
clash when we add perf_evlist__add() 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-13-jolsa@kernel.org


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

tools/perf/builtin-trace.c

+6 −6
Original line number Diff line number Diff line
@@ -2616,7 +2616,7 @@ static int trace__record(struct trace *trace, int argc, const char **argv) 


static size_t trace__fprintf_thread_summary(struct trace *trace, FILE *fp);



static bool perf_evlist__add_vfs_getname(struct evlist *evlist)

static bool evlist__add_vfs_getname(struct evlist *evlist)

{

	bool found = false;

	struct evsel *evsel, *tmp;
@@ -2719,8 +2719,8 @@ static int trace__add_syscall_newtp(struct trace *trace) 
	perf_evsel__config_callchain(sys_enter, &trace->opts, &callchain_param);

	perf_evsel__config_callchain(sys_exit, &trace->opts, &callchain_param);



	perf_evlist__add(evlist, sys_enter);

	perf_evlist__add(evlist, sys_exit);

	evlist__add(evlist, sys_enter);

	evlist__add(evlist, sys_exit);



	if (callchain_param.enabled && !trace->kernel_syscallchains) {

		/*
@@ -3264,7 +3264,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
			goto out_error_raw_syscalls;



		if (trace->trace_syscalls)

			trace->vfs_getname = perf_evlist__add_vfs_getname(evlist);

			trace->vfs_getname = evlist__add_vfs_getname(evlist);

	}



	if ((trace->trace_pgfaults & TRACE_PFMAJ)) {
@@ -3272,7 +3272,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
		if (pgfault_maj == NULL)

			goto out_error_mem;

		perf_evsel__config_callchain(pgfault_maj, &trace->opts, &callchain_param);

		perf_evlist__add(evlist, pgfault_maj);

		evlist__add(evlist, pgfault_maj);

	}



	if ((trace->trace_pgfaults & TRACE_PFMIN)) {
@@ -3280,7 +3280,7 @@ static int trace__run(struct trace *trace, int argc, const char **argv) 
		if (pgfault_min == NULL)

			goto out_error_mem;

		perf_evsel__config_callchain(pgfault_min, &trace->opts, &callchain_param);

		perf_evlist__add(evlist, pgfault_min);

		evlist__add(evlist, pgfault_min);

	}



	if (trace->sched &&

tools/perf/tests/mmap-basic.c

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ int test__basic_mmap(struct test *test __maybe_unused, int subtest __maybe_unuse 
		evsels[i]->attr.wakeup_events = 1;

		perf_evsel__set_sample_id(evsels[i], false);



		perf_evlist__add(evlist, evsels[i]);

		evlist__add(evlist, evsels[i]);



		if (perf_evsel__open(evsels[i], cpus, threads) < 0) {

			pr_debug("failed to open counter: %s, "

tools/perf/tests/openat-syscall-tp-fields.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ int test__syscall_openat_tp_fields(struct test *test __maybe_unused, int subtest 
		goto out_delete_evlist;

	}



	perf_evlist__add(evlist, evsel);

	evlist__add(evlist, evsel);



	err = perf_evlist__create_maps(evlist, &opts.target);

	if (err < 0) {

tools/perf/tests/sw-clock.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ static int __test__sw_clock_freq(enum perf_sw_ids clock_id) 
		pr_debug("perf_evsel__new\n");

		goto out_delete_evlist;

	}

	perf_evlist__add(evlist, evsel);

	evlist__add(evlist, evsel);



	cpus = cpu_map__dummy_new();

	threads = thread_map__new_by_tid(getpid());

tools/perf/util/evlist.c

+8 −8
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void perf_evlist__propagate_maps(struct evlist *evlist) 
		__perf_evlist__propagate_maps(evlist, evsel);

}



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

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

{

	entry->evlist = evlist;

	list_add_tail(&entry->node, &evlist->entries);
@@ -204,7 +204,7 @@ void perf_evlist__splice_list_tail(struct evlist *evlist, 


	__evlist__for_each_entry_safe(list, temp, evsel) {

		list_del_init(&evsel->node);

		perf_evlist__add(evlist, evsel);

		evlist__add(evlist, evsel);

	}

}
@@ -237,7 +237,7 @@ int __perf_evlist__add_default(struct evlist *evlist, bool precise) 
	if (evsel == NULL)

		return -ENOMEM;



	perf_evlist__add(evlist, evsel);

	evlist__add(evlist, evsel);

	return 0;

}
@@ -253,11 +253,11 @@ int perf_evlist__add_dummy(struct evlist *evlist) 
	if (evsel == NULL)

		return -ENOMEM;



	perf_evlist__add(evlist, evsel);

	evlist__add(evlist, evsel);

	return 0;

}



static int perf_evlist__add_attrs(struct evlist *evlist,

static int evlist__add_attrs(struct evlist *evlist,

				  struct perf_event_attr *attrs, size_t nr_attrs)

{

	struct evsel *evsel, *n;
@@ -289,7 +289,7 @@ int __perf_evlist__add_default_attrs(struct evlist *evlist, 
	for (i = 0; i < nr_attrs; i++)

		event_attr_init(attrs + i);



	return perf_evlist__add_attrs(evlist, attrs, nr_attrs);

	return evlist__add_attrs(evlist, attrs, nr_attrs);

}



struct evsel *
@@ -330,7 +330,7 @@ int perf_evlist__add_newtp(struct evlist *evlist, 
		return -1;



	evsel->handler = handler;

	perf_evlist__add(evlist, evsel);

	evlist__add(evlist, evsel);

	return 0;

}
@@ -1854,7 +1854,7 @@ int perf_evlist__add_sb_event(struct evlist **evlist, 


	evsel->side_band.cb = cb;

	evsel->side_band.data = data;

	perf_evlist__add(*evlist, evsel);

	evlist__add(*evlist, evsel);

	return 0;



out_err:

CRA Git | Maintained and supported by SUSTech CRA and CCSE