Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

perf tools: Rename some variables for better understanding

Browse source 
Trivial patch to improve understanding of code.

Varible attr is usually used for struct perf_event_attr. Using it in a
different context is irritating. Thus, renaming it.

Signed-off-by: Robert Richter <robert.richter@amd.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1345144224-27280-4-git-send-email-robert.richter@amd.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Robert Richter 2012-08-16 21:10:19 +02:00 committed by Arnaldo Carvalho de Melo
parent ca1b145761
commit 6606f8733d
1 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
tools/perf/util/header.c
View file

@ -608,11 +608,11 @@ static int write_nrcpus(int fd, struct perf_header *h __used,
static int write_event_desc(int fd, struct perf_header *h __used, static int write_event_desc(int fd, struct perf_header *h __used,
struct perf_evlist *evlist) struct perf_evlist *evlist)
{ {
struct perf_evsel *attr; struct perf_evsel *evsel;
u32 nre = 0, nri, sz; u32 nre = 0, nri, sz;
int ret; int ret;
list_for_each_entry(attr, &evlist->entries, node) list_for_each_entry(evsel, &evlist->entries, node)
nre++; nre++;
/* /*
@ -625,14 +625,14 @@ static int write_event_desc(int fd, struct perf_header *h __used,
/* /*
* size of perf_event_attr struct * size of perf_event_attr struct
*/ */
sz = (u32)sizeof(attr->attr); sz = (u32)sizeof(evsel->attr);
ret = do_write(fd, &sz, sizeof(sz)); ret = do_write(fd, &sz, sizeof(sz));
if (ret < 0) if (ret < 0)
return ret; return ret;
list_for_each_entry(attr, &evlist->entries, node) { list_for_each_entry(evsel, &evlist->entries, node) {
ret = do_write(fd, &attr->attr, sz); ret = do_write(fd, &evsel->attr, sz);
if (ret < 0) if (ret < 0)
return ret; return ret;
/* /*
@ -642,7 +642,7 @@ static int write_event_desc(int fd, struct perf_header *h __used,
* copy into an nri to be independent of the * copy into an nri to be independent of the
* type of ids, * type of ids,
*/ */
nri = attr->ids; nri = evsel->ids;
ret = do_write(fd, &nri, sizeof(nri)); ret = do_write(fd, &nri, sizeof(nri));
if (ret < 0) if (ret < 0)
return ret; return ret;
@ -650,13 +650,13 @@ static int write_event_desc(int fd, struct perf_header *h __used,
/* /*
* write event string as passed on cmdline * write event string as passed on cmdline
*/ */
ret = do_write_string(fd, perf_evsel__name(attr)); ret = do_write_string(fd, perf_evsel__name(evsel));
if (ret < 0) if (ret < 0)
return ret; return ret;
/* /*
* write unique ids for this event * write unique ids for this event
*/ */
ret = do_write(fd, attr->id, attr->ids * sizeof(u64)); ret = do_write(fd, evsel->id, evsel->ids * sizeof(u64));
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
@ -1683,7 +1683,7 @@ int perf_session__write_header(struct perf_session *session,
struct perf_file_header f_header; struct perf_file_header f_header;
struct perf_file_attr f_attr; struct perf_file_attr f_attr;
struct perf_header *header = &session->header; struct perf_header *header = &session->header;
struct perf_evsel *attr, *pair = NULL; struct perf_evsel *evsel, *pair = NULL;
int err; int err;
lseek(fd, sizeof(f_header), SEEK_SET); lseek(fd, sizeof(f_header), SEEK_SET);
@ -1691,9 +1691,9 @@ int perf_session__write_header(struct perf_session *session,
if (session->evlist != evlist) if (session->evlist != evlist)
pair = perf_evlist__first(session->evlist); pair = perf_evlist__first(session->evlist);
list_for_each_entry(attr, &evlist->entries, node) { list_for_each_entry(evsel, &evlist->entries, node) {
attr->id_offset = lseek(fd, 0, SEEK_CUR); evsel->id_offset = lseek(fd, 0, SEEK_CUR);
err = do_write(fd, attr->id, attr->ids * sizeof(u64)); err = do_write(fd, evsel->id, evsel->ids * sizeof(u64));
if (err < 0) { if (err < 0) {
out_err_write: out_err_write:
pr_debug("failed to write perf header\n"); pr_debug("failed to write perf header\n");
@ -1703,19 +1703,19 @@ int perf_session__write_header(struct perf_session *session,
err = do_write(fd, pair->id, pair->ids * sizeof(u64)); err = do_write(fd, pair->id, pair->ids * sizeof(u64));
if (err < 0) if (err < 0)
goto out_err_write; goto out_err_write;
attr->ids += pair->ids; evsel->ids += pair->ids;
pair = perf_evsel__next(pair); pair = perf_evsel__next(pair);
} }
} }
header->attr_offset = lseek(fd, 0, SEEK_CUR); header->attr_offset = lseek(fd, 0, SEEK_CUR);
list_for_each_entry(attr, &evlist->entries, node) { list_for_each_entry(evsel, &evlist->entries, node) {
f_attr = (struct perf_file_attr){ f_attr = (struct perf_file_attr){
.attr = attr->attr, .attr = evsel->attr,
.ids = { .ids = {
.offset = attr->id_offset, .offset = evsel->id_offset,
.size = attr->ids * sizeof(u64), .size = evsel->ids * sizeof(u64),
} }
}; };
err = do_write(fd, &f_attr, sizeof(f_attr)); err = do_write(fd, &f_attr, sizeof(f_attr));
@ -2277,12 +2277,12 @@ int perf_event__synthesize_attrs(struct perf_tool *tool,
struct perf_session *session, struct perf_session *session,
perf_event__handler_t process) perf_event__handler_t process)
{ {
struct perf_evsel *attr; struct perf_evsel *evsel;
int err = 0; int err = 0;
list_for_each_entry(attr, &session->evlist->entries, node) { list_for_each_entry(evsel, &session->evlist->entries, node) {
err = perf_event__synthesize_attr(tool, &attr->attr, attr->ids, err = perf_event__synthesize_attr(tool, &evsel->attr, evsel->ids,
attr->id, process); evsel->id, process);
if (err) { if (err) {
pr_debug("failed to create perf header attribute\n"); pr_debug("failed to create perf header attribute\n");
return err; return err;