Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 323725
b: refs/heads/master
c: 4e1b9c6
h: refs/heads/master
i:
  323723: 0251451
v: v3
  • Loading branch information
Robert Richter authored and Arnaldo Carvalho de Melo committed Aug 22, 2012
1 parent f94ca0d commit 7cc1e0f
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 42 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ac2ba9f36bb400755e411309f3e76dbf308a10e7
refs/heads/master: 4e1b9c679fcb208275b55eb8fc46c2d58ef6a2ee
134 changes: 93 additions & 41 deletions trunk/tools/perf/util/header.c
Original file line number Diff line number Diff line change
Expand Up @@ -1148,12 +1148,29 @@ static void print_cpu_topology(struct perf_header *ph, int fd, FILE *fp)
}
}

static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
static void free_event_desc(struct perf_evsel *events)
{
struct perf_event_attr attr;
uint64_t id;
struct perf_evsel *evsel;

if (!events)
return;

for (evsel = events; evsel->attr.size; evsel++) {
if (evsel->name)
free(evsel->name);
if (evsel->id)
free(evsel->id);
}

free(events);
}

static struct perf_evsel *
read_event_desc(struct perf_header *ph, int fd)
{
struct perf_evsel *evsel, *events = NULL;
u64 *id;
void *buf = NULL;
char *str;
u32 nre, sz, nr, i, j;
ssize_t ret;
size_t msz;
Expand All @@ -1173,18 +1190,22 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
if (ph->needs_swap)
sz = bswap_32(sz);

memset(&attr, 0, sizeof(attr));

/* buffer to hold on file attr struct */
buf = malloc(sz);
if (!buf)
goto error;

msz = sizeof(attr);
/* the last event terminates with evsel->attr.size == 0: */
events = calloc(nre + 1, sizeof(*events));
if (!events)
goto error;

msz = sizeof(evsel->attr);
if (sz < msz)
msz = sz;

for (i = 0 ; i < nre; i++) {
for (i = 0, evsel = events; i < nre; evsel++, i++) {
evsel->idx = i;

/*
* must read entire on-file attr struct to
Expand All @@ -1197,7 +1218,7 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
if (ph->needs_swap)
perf_event__attr_swap(buf);

memcpy(&attr, buf, msz);
memcpy(&evsel->attr, buf, msz);

ret = read(fd, &nr, sizeof(nr));
if (ret != (ssize_t)sizeof(nr))
Expand All @@ -1206,51 +1227,82 @@ static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
if (ph->needs_swap)
nr = bswap_32(nr);

str = do_read_string(fd, ph);
fprintf(fp, "# event : name = %s, ", str);
free(str);
evsel->name = do_read_string(fd, ph);

if (!nr)
continue;

id = calloc(nr, sizeof(*id));
if (!id)
goto error;
evsel->ids = nr;
evsel->id = id;

for (j = 0 ; j < nr; j++) {
ret = read(fd, id, sizeof(*id));
if (ret != (ssize_t)sizeof(*id))
goto error;
if (ph->needs_swap)
*id = bswap_64(*id);
id++;
}
}
out:
if (buf)
free(buf);
return events;
error:
if (events)
free_event_desc(events);
events = NULL;
goto out;
}

static void print_event_desc(struct perf_header *ph, int fd, FILE *fp)
{
struct perf_evsel *evsel, *events = read_event_desc(ph, fd);
u32 j;
u64 *id;

if (!events) {
fprintf(fp, "# event desc: not available or unable to read\n");
return;
}

for (evsel = events; evsel->attr.size; evsel++) {
fprintf(fp, "# event : name = %s, ", evsel->name);

fprintf(fp, "type = %d, config = 0x%"PRIx64
", config1 = 0x%"PRIx64", config2 = 0x%"PRIx64,
attr.type,
(u64)attr.config,
(u64)attr.config1,
(u64)attr.config2);
evsel->attr.type,
(u64)evsel->attr.config,
(u64)evsel->attr.config1,
(u64)evsel->attr.config2);

fprintf(fp, ", excl_usr = %d, excl_kern = %d",
attr.exclude_user,
attr.exclude_kernel);
evsel->attr.exclude_user,
evsel->attr.exclude_kernel);

fprintf(fp, ", excl_host = %d, excl_guest = %d",
attr.exclude_host,
attr.exclude_guest);
evsel->attr.exclude_host,
evsel->attr.exclude_guest);

fprintf(fp, ", precise_ip = %d", attr.precise_ip);
fprintf(fp, ", precise_ip = %d", evsel->attr.precise_ip);

if (nr)
if (evsel->ids) {
fprintf(fp, ", id = {");

for (j = 0 ; j < nr; j++) {
ret = read(fd, &id, sizeof(id));
if (ret != (ssize_t)sizeof(id))
goto error;

if (ph->needs_swap)
id = bswap_64(id);

if (j)
fputc(',', fp);

fprintf(fp, " %"PRIu64, id);
}
if (nr && j == nr)
for (j = 0, id = evsel->id; j < evsel->ids; j++, id++) {
if (j)
fputc(',', fp);
fprintf(fp, " %"PRIu64, *id);
}
fprintf(fp, " }");
}

fputc('\n', fp);
}
free(buf);
return;
error:
fprintf(fp, "# event desc: not available or unable to read\n");

free_event_desc(events);
}

static void print_total_mem(struct perf_header *h __used, int fd, FILE *fp)
Expand Down

0 comments on commit 7cc1e0f

Please sign in to comment.