Commit 4c703828 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf evsel: Rename perf_evsel__object_config() to evsel__object_config() 



As it is a 'struct evsel' method, not part of tools/lib/perf/, aka
libperf, to whom the perf_ prefix belongs.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5cde2653

tools/perf/util/evsel.c

+6 −7
Original line number Diff line number Diff line
@@ -56,14 +56,14 @@ struct perf_missing_features perf_missing_features; 


static clockid_t clockid;



static int perf_evsel__no_extra_init(struct evsel *evsel __maybe_unused)

static int evsel__no_extra_init(struct evsel *evsel __maybe_unused)

{

	return 0;

}



void __weak test_attr__ready(void) { }



static void perf_evsel__no_extra_fini(struct evsel *evsel __maybe_unused)

static void evsel__no_extra_fini(struct evsel *evsel __maybe_unused)

{

}
@@ -73,12 +73,11 @@ static struct { 
	void	(*fini)(struct evsel *evsel);

} perf_evsel__object = {

	.size = sizeof(struct evsel),

	.init = perf_evsel__no_extra_init,

	.fini = perf_evsel__no_extra_fini,

	.init = evsel__no_extra_init,

	.fini = evsel__no_extra_fini,

};



int perf_evsel__object_config(size_t object_size,

			      int (*init)(struct evsel *evsel),

int evsel__object_config(size_t object_size, int (*init)(struct evsel *evsel),

			 void (*fini)(struct evsel *evsel))

{

tools/perf/util/evsel.h

+3 −3
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ void perf_counts_values__scale(struct perf_counts_values *count, 
void evsel__compute_deltas(struct evsel *evsel, int cpu, int thread,

			   struct perf_counts_values *count);



int perf_evsel__object_config(size_t object_size,

int evsel__object_config(size_t object_size,

			 int (*init)(struct evsel *evsel),

			 void (*fini)(struct evsel *evsel));

tools/perf/util/hist.c

+2 −3
Original line number Diff line number Diff line
@@ -2845,9 +2845,8 @@ static int hists_evsel__init(struct evsel *evsel) 


int hists__init(void)

{

	int err = perf_evsel__object_config(sizeof(struct hists_evsel),

					    hists_evsel__init,

					    hists_evsel__exit);

	int err = evsel__object_config(sizeof(struct hists_evsel),

				       hists_evsel__init, hists_evsel__exit);

	if (err)

		fputs("FATAL ERROR: Couldn't setup hists class\n", stderr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE