Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 323871
b: refs/heads/master
c: 3d7eb86
h: refs/heads/master
i:
  323869: f51b8cc
  323867: f091722
  323863: 49b27a7
  323855: 37bde0e
  323839: 8d2378f
v: v3
  • Loading branch information
Namhyung Kim authored and Arnaldo Carvalho de Melo committed Sep 24, 2012
1 parent 07e0680 commit b53a797
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 36 deletions.
2 changes: 1 addition & 1 deletion [refs]
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 7e94cfcc9d201984a7be00a4fb42050c69ec4c56
refs/heads/master: 3d7eb86b9d84e7493c8c835fbcd2a3fe4a1f5937
70 changes: 35 additions & 35 deletions trunk/tools/perf/util/header.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1580,18 +1580,16 @@ static int perf_header__read_build_ids(struct perf_header *header,
return err;
}

static int process_tracing_data(struct perf_file_section *section
__maybe_unused,
struct perf_header *ph __maybe_unused,
int feat __maybe_unused, int fd, void *data)
static int process_tracing_data(struct perf_file_section *section __maybe_unused,
struct perf_header *ph __maybe_unused,
int fd, void *data)
{
trace_report(fd, data, false);
return 0;
}

static int process_build_id(struct perf_file_section *section,
struct perf_header *ph,
int feat __maybe_unused, int fd,
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
if (perf_header__read_build_ids(ph, fd, section->offset, section->size))
Expand All @@ -1600,40 +1598,40 @@ static int process_build_id(struct perf_file_section *section,
}

static int process_hostname(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
ph->env.hostname = do_read_string(fd, ph);
return ph->env.hostname ? 0 : -ENOMEM;
}

static int process_osrelease(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
ph->env.os_release = do_read_string(fd, ph);
return ph->env.os_release ? 0 : -ENOMEM;
}

static int process_version(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
ph->env.version = do_read_string(fd, ph);
return ph->env.version ? 0 : -ENOMEM;
}

static int process_arch(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
ph->env.arch = do_read_string(fd, ph);
return ph->env.arch ? 0 : -ENOMEM;
}

static int process_nrcpus(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
size_t ret;
u32 nr;
Expand All @@ -1659,24 +1657,24 @@ static int process_nrcpus(struct perf_file_section *section __maybe_unused,
}

static int process_cpudesc(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
ph->env.cpu_desc = do_read_string(fd, ph);
return ph->env.cpu_desc ? 0 : -ENOMEM;
}

static int process_cpuid(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
ph->env.cpuid = do_read_string(fd, ph);
return ph->env.cpuid ? 0 : -ENOMEM;
}

static int process_total_mem(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
uint64_t mem;
size_t ret;
Expand Down Expand Up @@ -1711,7 +1709,8 @@ perf_evlist__find_by_index(struct perf_evlist *evlist, int idx)
}

static void
perf_evlist__set_event_name(struct perf_evlist *evlist, struct perf_evsel *event)
perf_evlist__set_event_name(struct perf_evlist *evlist,
struct perf_evsel *event)
{
struct perf_evsel *evsel;

Expand All @@ -1730,15 +1729,16 @@ perf_evlist__set_event_name(struct perf_evlist *evlist, struct perf_evsel *event

static int
process_event_desc(struct perf_file_section *section __maybe_unused,
struct perf_header *header, int feat __maybe_unused, int fd,
struct perf_header *header, int fd,
void *data __maybe_unused)
{
struct perf_session *session = container_of(header, struct perf_session, header);
struct perf_session *session;
struct perf_evsel *evsel, *events = read_event_desc(header, fd);

if (!events)
return 0;

session = container_of(header, struct perf_session, header);
for (evsel = events; evsel->attr.size; evsel++)
perf_evlist__set_event_name(session->evlist, evsel);

Expand All @@ -1748,8 +1748,8 @@ process_event_desc(struct perf_file_section *section __maybe_unused,
}

static int process_cmdline(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
size_t ret;
char *str;
Expand Down Expand Up @@ -1784,8 +1784,8 @@ static int process_cmdline(struct perf_file_section *section __maybe_unused,
}

static int process_cpu_topology(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
size_t ret;
u32 nr, i;
Expand Down Expand Up @@ -1840,8 +1840,8 @@ static int process_cpu_topology(struct perf_file_section *section __maybe_unused
}

static int process_numa_topology(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
size_t ret;
u32 nr, node, i;
Expand Down Expand Up @@ -1900,8 +1900,8 @@ static int process_numa_topology(struct perf_file_section *section __maybe_unuse
}

static int process_pmu_mappings(struct perf_file_section *section __maybe_unused,
struct perf_header *ph, int feat __maybe_unused,
int fd, void *data __maybe_unused)
struct perf_header *ph, int fd,
void *data __maybe_unused)
{
size_t ret;
char *name;
Expand Down Expand Up @@ -1954,7 +1954,7 @@ struct feature_ops {
void (*print)(struct perf_header *h, int fd, FILE *fp);
char *(*read)(struct perf_header *h, int fd);
int (*process)(struct perf_file_section *section,
struct perf_header *h, int feat, int fd, void *data);
struct perf_header *h, int fd, void *data);
const char *name;
bool full_only;
};
Expand Down Expand Up @@ -2520,7 +2520,7 @@ static int perf_file_section__process(struct perf_file_section *section,
if (!feat_ops[feat].process)
return 0;

return feat_ops[feat].process(section, ph, feat, fd, data);
return feat_ops[feat].process(section, ph, fd, data);
}

static int perf_file_header__read_pipe(struct perf_pipe_file_header *header,
Expand Down

0 comments on commit b53a797

Please sign in to comment.