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

perf evlist: Fix the class prefix for 'struct evlist' strerror methods 



To differentiate from libperf's 'struct perf_evlist' methods.

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 e251abee

tools/perf/builtin-trace.c

+2 −2
Original line number Diff line number Diff line
@@ -4149,11 +4149,11 @@ out_error_raw_syscalls: 
	goto out_error;



out_error_mmap:

	perf_evlist__strerror_mmap(evlist, errno, errbuf, sizeof(errbuf));

	evlist__strerror_mmap(evlist, errno, errbuf, sizeof(errbuf));

	goto out_error;



out_error_open:

	perf_evlist__strerror_open(evlist, errno, errbuf, sizeof(errbuf));

	evlist__strerror_open(evlist, errno, errbuf, sizeof(errbuf));



out_error:

	fprintf(trace->output, "%s\n", errbuf);

tools/perf/tests/code-reading.c

+1 −1
Original line number Diff line number Diff line
@@ -678,7 +678,7 @@ static int do_test_code_reading(bool try_kcore) 


			if (verbose > 0) {

				char errbuf[512];

				perf_evlist__strerror_open(evlist, errno, errbuf, sizeof(errbuf));

				evlist__strerror_open(evlist, errno, errbuf, sizeof(errbuf));

				pr_debug("perf_evlist__open() failed!\n%s\n", errbuf);

			}

tools/perf/util/evlist.c

+2 −3
Original line number Diff line number Diff line
@@ -1461,8 +1461,7 @@ int perf_evlist__parse_sample_timestamp(struct evlist *evlist, 
	return evsel__parse_sample_timestamp(evsel, event, timestamp);

}



int perf_evlist__strerror_open(struct evlist *evlist,

			       int err, char *buf, size_t size)

int evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_t size)

{

	int printed, value;

	char sbuf[STRERR_BUFSIZE], *emsg = str_error_r(err, sbuf, sizeof(sbuf));
@@ -1515,7 +1514,7 @@ out_default: 
	return 0;

}



int perf_evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size)

int evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size)

{

	char sbuf[STRERR_BUFSIZE], *emsg = str_error_r(err, sbuf, sizeof(sbuf));

	int pages_attempted = evlist->core.mmap_len / 1024, pages_max_per_user, printed = 0;

tools/perf/util/evlist.h

+2 −2
Original line number Diff line number Diff line
@@ -257,8 +257,8 @@ static inline struct evsel *evlist__last(struct evlist *evlist) 
	return container_of(evsel, struct evsel, core);

}



int perf_evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_t size);

int perf_evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size);

int evlist__strerror_open(struct evlist *evlist, int err, char *buf, size_t size);

int evlist__strerror_mmap(struct evlist *evlist, int err, char *buf, size_t size);



bool perf_evlist__can_select_event(struct evlist *evlist, const char *str);

void perf_evlist__to_front(struct evlist *evlist,

CRA Git | Maintained and supported by SUSTech CRA and CCSE