Skip to content

Commit

Permalink
perf tools: Rename 'struct sample_data' to 'struct perf_sample'
Browse files Browse the repository at this point in the history 
Making the namespace more uniform.

Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Jan 29, 2011
1 parent 93fc64f commit 8d50e5b
Show file tree
Hide file tree
Showing 18 changed files with 72 additions and 72 deletions.
2 changes: 1 addition & 1 deletion tools/perf/builtin-annotate.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ static int hists__add_entry(struct hists *self, struct addr_location *al)
return hist_entry__inc_addr_samples(he, al->addr);
}

static int process_sample_event(event_t *event, struct sample_data *sample,
static int process_sample_event(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
struct addr_location al;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-diff.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ static int hists__add_entry(struct hists *self,
}

static int diff__process_sample_event(event_t *event,
struct sample_data *sample,
struct perf_sample *sample,
struct perf_session *session)
{
struct addr_location al;
Expand Down
8 changes: 4 additions & 4 deletions tools/perf/builtin-inject.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ static int event__repipe_synth(event_t *event,
return 0;
}

static int event__repipe(event_t *event, struct sample_data *sample __used,
static int event__repipe(event_t *event, struct perf_sample *sample __used,
struct perf_session *session)
{
return event__repipe_synth(event, session);
}

static int event__repipe_mmap(event_t *self, struct sample_data *sample,
static int event__repipe_mmap(event_t *self, struct perf_sample *sample,
struct perf_session *session)
{
int err;
Expand All @@ -53,7 +53,7 @@ static int event__repipe_mmap(event_t *self, struct sample_data *sample,
return err;
}

static int event__repipe_task(event_t *self, struct sample_data *sample,
static int event__repipe_task(event_t *self, struct perf_sample *sample,
struct perf_session *session)
{
int err;
Expand Down Expand Up @@ -119,7 +119,7 @@ static int dso__inject_build_id(struct dso *self, struct perf_session *session)
return 0;
}

static int event__inject_buildid(event_t *event, struct sample_data *sample,
static int event__inject_buildid(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
struct addr_location al;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-kmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ process_raw_event(event_t *raw_event __used, void *data,
}
}

static int process_sample_event(event_t *event, struct sample_data *sample,
static int process_sample_event(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
struct thread *thread = perf_session__findnew(session, event->ip.pid);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-lock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -834,7 +834,7 @@ static void dump_info(void)
die("Unknown type of information\n");
}

static int process_sample_event(event_t *self, struct sample_data *sample,
static int process_sample_event(event_t *self, struct perf_sample *sample,
struct perf_session *s)
{
struct thread *thread = perf_session__findnew(s, sample->tid);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-record.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static void write_output(void *buf, size_t size)
}

static int process_synthesized_event(event_t *event,
struct sample_data *sample __used,
struct perf_sample *sample __used,
struct perf_session *self __used)
{
write_output(event, event->header.size);
Expand Down
36 changes: 18 additions & 18 deletions tools/perf/builtin-report.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,38 +77,38 @@ static struct hists *perf_session__hists_findnew(struct perf_session *self,
return new;
}

static int perf_session__add_hist_entry(struct perf_session *self,
static int perf_session__add_hist_entry(struct perf_session *session,
struct addr_location *al,
struct sample_data *data)
struct perf_sample *sample)
{
struct symbol *parent = NULL;
int err = 0;
struct hist_entry *he;
struct hists *hists;
struct perf_event_attr *attr;

if ((sort__has_parent || symbol_conf.use_callchain) && data->callchain) {
err = perf_session__resolve_callchain(self, al->thread,
data->callchain, &parent);
if ((sort__has_parent || symbol_conf.use_callchain) && sample->callchain) {
err = perf_session__resolve_callchain(session, al->thread,
sample->callchain, &parent);
if (err)
return err;
}

attr = perf_header__find_attr(data->id, &self->header);
attr = perf_header__find_attr(sample->id, &session->header);
if (attr)
hists = perf_session__hists_findnew(self, data->id, attr->type, attr->config);
hists = perf_session__hists_findnew(session, sample->id, attr->type, attr->config);
else
hists = perf_session__hists_findnew(self, data->id, 0, 0);
hists = perf_session__hists_findnew(session, sample->id, 0, 0);
if (hists == NULL)
return -ENOMEM;

he = __hists__add_entry(hists, al, parent, data->period);
he = __hists__add_entry(hists, al, parent, sample->period);
if (he == NULL)
return -ENOMEM;

if (symbol_conf.use_callchain) {
err = callchain_append(he->callchain, &self->callchain_cursor,
data->period);
err = callchain_append(he->callchain, &session->callchain_cursor,
sample->period);
if (err)
return err;
}
Expand All @@ -124,32 +124,32 @@ static int perf_session__add_hist_entry(struct perf_session *self,
}

static int add_event_total(struct perf_session *session,
struct sample_data *data,
struct perf_sample *sample,
struct perf_event_attr *attr)
{
struct hists *hists;

if (attr)
hists = perf_session__hists_findnew(session, data->id,
hists = perf_session__hists_findnew(session, sample->id,
attr->type, attr->config);
else
hists = perf_session__hists_findnew(session, data->id, 0, 0);
hists = perf_session__hists_findnew(session, sample->id, 0, 0);

if (!hists)
return -ENOMEM;

hists->stats.total_period += data->period;
hists->stats.total_period += sample->period;
/*
* FIXME: add_event_total should be moved from here to
* perf_session__process_event so that the proper hist is passed to
* the event_op methods.
*/
hists__inc_nr_events(hists, PERF_RECORD_SAMPLE);
session->hists.stats.total_period += data->period;
session->hists.stats.total_period += sample->period;
return 0;
}

static int process_sample_event(event_t *event, struct sample_data *sample,
static int process_sample_event(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
struct addr_location al;
Expand Down Expand Up @@ -179,7 +179,7 @@ static int process_sample_event(event_t *event, struct sample_data *sample,
return 0;
}

static int process_read_event(event_t *event, struct sample_data *sample __used,
static int process_read_event(event_t *event, struct perf_sample *sample __used,
struct perf_session *session __used)
{
struct perf_event_attr *attr;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-sched.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1607,7 +1607,7 @@ process_raw_event(event_t *raw_event __used, struct perf_session *session,
process_sched_migrate_task_event(data, session, event, cpu, timestamp, thread);
}

static int process_sample_event(event_t *event, struct sample_data *sample,
static int process_sample_event(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
struct thread *thread;
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ static int cleanup_scripting(void)

static char const *input_name = "perf.data";

static int process_sample_event(event_t *event, struct sample_data *sample,
static int process_sample_event(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
struct thread *thread = perf_session__findnew(session, event->ip.pid);
Expand Down
2 changes: 1 addition & 1 deletion tools/perf/builtin-test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ static int test__basic_mmap(void)
}

while ((event = perf_evlist__read_on_cpu(evlist, 0)) != NULL) {
struct sample_data sample;
struct perf_sample sample;

if (event->header.type != PERF_RECORD_SAMPLE) {
pr_debug("unexpected %s event\n",
Expand Down
8 changes: 4 additions & 4 deletions tools/perf/builtin-timechart.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -276,21 +276,21 @@ static int cpus_cstate_state[MAX_CPUS];
static u64 cpus_pstate_start_times[MAX_CPUS];
static u64 cpus_pstate_state[MAX_CPUS];

static int process_comm_event(event_t *event, struct sample_data *sample __used,
static int process_comm_event(event_t *event, struct perf_sample *sample __used,
struct perf_session *session __used)
{
pid_set_comm(event->comm.tid, event->comm.comm);
return 0;
}

static int process_fork_event(event_t *event, struct sample_data *sample __used,
static int process_fork_event(event_t *event, struct perf_sample *sample __used,
struct perf_session *session __used)
{
pid_fork(event->fork.pid, event->fork.ppid, event->fork.time);
return 0;
}

static int process_exit_event(event_t *event, struct sample_data *sample __used,
static int process_exit_event(event_t *event, struct perf_sample *sample __used,
struct perf_session *session __used)
{
pid_exit(event->fork.pid, event->fork.time);
Expand Down Expand Up @@ -487,7 +487,7 @@ static void sched_switch(int cpu, u64 timestamp, struct trace_entry *te)


static int process_sample_event(event_t *event __used,
struct sample_data *sample,
struct perf_sample *sample,
struct perf_session *session)
{
struct trace_entry *te;
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/builtin-top.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,7 @@ static int symbol_filter(struct map *map, struct symbol *sym)
}

static void event__process_sample(const event_t *self,
struct sample_data *sample,
struct perf_sample *sample,
struct perf_session *session)
{
u64 ip = self->ip.ip;
Expand Down Expand Up @@ -1107,7 +1107,7 @@ static void event__process_sample(const event_t *self,

static void perf_session__mmap_read_cpu(struct perf_session *self, int cpu)
{
struct sample_data sample;
struct perf_sample sample;
event_t *event;

while ((event = perf_evlist__read_on_cpu(evsel_list, cpu)) != NULL) {
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/build-id.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#include "debug.h"

static int build_id__mark_dso_hit(event_t *event,
struct sample_data *sample __used,
struct perf_sample *sample __used,
struct perf_session *session)
{
struct addr_location al;
Expand All @@ -37,7 +37,7 @@ static int build_id__mark_dso_hit(event_t *event,
return 0;
}

static int event__exit_del_thread(event_t *self, struct sample_data *sample __used,
static int event__exit_del_thread(event_t *self, struct perf_sample *sample __used,
struct perf_session *session)
{
struct thread *thread = perf_session__findnew(session, self->fork.tid);
Expand Down
16 changes: 8 additions & 8 deletions tools/perf/util/event.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const char *event__get_event_name(unsigned int id)
return event__name[id];
}

static struct sample_data synth_sample = {
static struct perf_sample synth_sample = {
.pid = -1,
.tid = -1,
.time = -1,
Expand Down Expand Up @@ -440,7 +440,7 @@ static int thread__set_comm_adjust(struct thread *self, const char *comm,
return 0;
}

int event__process_comm(event_t *self, struct sample_data *sample __used,
int event__process_comm(event_t *self, struct perf_sample *sample __used,
struct perf_session *session)
{
struct thread *thread = perf_session__findnew(session, self->comm.tid);
Expand All @@ -456,7 +456,7 @@ int event__process_comm(event_t *self, struct sample_data *sample __used,
return 0;
}

int event__process_lost(event_t *self, struct sample_data *sample __used,
int event__process_lost(event_t *self, struct perf_sample *sample __used,
struct perf_session *session)
{
dump_printf(": id:%" PRIu64 ": lost:%" PRIu64 "\n",
Expand Down Expand Up @@ -567,7 +567,7 @@ static int event__process_kernel_mmap(event_t *self,
return -1;
}

int event__process_mmap(event_t *self, struct sample_data *sample __used,
int event__process_mmap(event_t *self, struct perf_sample *sample __used,
struct perf_session *session)
{
struct machine *machine;
Expand Down Expand Up @@ -609,7 +609,7 @@ int event__process_mmap(event_t *self, struct sample_data *sample __used,
return 0;
}

int event__process_task(event_t *self, struct sample_data *sample __used,
int event__process_task(event_t *self, struct perf_sample *sample __used,
struct perf_session *session)
{
struct thread *thread = perf_session__findnew(session, self->fork.tid);
Expand All @@ -632,7 +632,7 @@ int event__process_task(event_t *self, struct sample_data *sample __used,
return 0;
}

int event__process(event_t *event, struct sample_data *sample,
int event__process(event_t *event, struct perf_sample *sample,
struct perf_session *session)
{
switch (event->header.type) {
Expand Down Expand Up @@ -757,7 +757,7 @@ static void dso__calc_col_width(struct dso *self, struct hists *hists)
}

int event__preprocess_sample(const event_t *self, struct perf_session *session,
struct addr_location *al, struct sample_data *data,
struct addr_location *al, struct perf_sample *sample,
symbol_filter_t filter)
{
u8 cpumode = self->header.misc & PERF_RECORD_MISC_CPUMODE_MASK;
Expand Down Expand Up @@ -788,7 +788,7 @@ int event__preprocess_sample(const event_t *self, struct perf_session *session,
al->map ? al->map->dso->long_name :
al->level == 'H' ? "[hypervisor]" : "<not found>");
al->sym = NULL;
al->cpu = data->cpu;
al->cpu = sample->cpu;

if (al->map) {
if (symbol_conf.dso_list &&
Expand Down
18 changes: 9 additions & 9 deletions tools/perf/util/event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ struct sample_event {
u64 array[];
};

struct sample_data {
struct perf_sample {
u64 ip;
u32 pid, tid;
u64 time;
Expand Down Expand Up @@ -138,7 +138,7 @@ struct perf_session;

typedef int (*event__handler_synth_t)(event_t *event,
struct perf_session *session);
typedef int (*event__handler_t)(event_t *event, struct sample_data *sample,
typedef int (*event__handler_t)(event_t *event, struct perf_sample *sample,
struct perf_session *session);

int event__synthesize_thread(pid_t pid, event__handler_t process,
Expand All @@ -154,25 +154,25 @@ int event__synthesize_modules(event__handler_t process,
struct perf_session *session,
struct machine *machine);

int event__process_comm(event_t *self, struct sample_data *sample,
int event__process_comm(event_t *event, struct perf_sample *sample,
struct perf_session *session);
int event__process_lost(event_t *self, struct sample_data *sample,
int event__process_lost(event_t *event, struct perf_sample *sample,
struct perf_session *session);
int event__process_mmap(event_t *self, struct sample_data *sample,
int event__process_mmap(event_t *event, struct perf_sample *sample,
struct perf_session *session);
int event__process_task(event_t *self, struct sample_data *sample,
int event__process_task(event_t *event, struct perf_sample *sample,
struct perf_session *session);
int event__process(event_t *event, struct sample_data *sample,
int event__process(event_t *event, struct perf_sample *sample,
struct perf_session *session);

struct addr_location;
int event__preprocess_sample(const event_t *self, struct perf_session *session,
struct addr_location *al, struct sample_data *data,
struct addr_location *al, struct perf_sample *sample,
symbol_filter_t filter);

const char *event__get_event_name(unsigned int id);

int event__parse_sample(const event_t *event, u64 type, bool sample_id_all,
struct sample_data *sample);
struct perf_sample *sample);

#endif /* __PERF_RECORD_H */
Loading

0 comments on commit 8d50e5b

Please sign in to comment.