Skip to content

Commit

Permalink
perf lock: Use evsel->tp_format and perf_sample
Browse files Browse the repository at this point in the history 
To reduce the number of parameters passed to the various event handling
functions.

Cc: Andrey Wagin <avagin@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-bipk647rzq357yot9ao6ih73@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Aug 8, 2012
1 parent 22ad798 commit 01d9552
Showing 1 changed file with 42 additions and 74 deletions.
116 changes: 42 additions & 74 deletions tools/perf/builtin-lock.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -357,28 +357,16 @@ struct trace_release_event {

struct trace_lock_handler {
void (*acquire_event)(struct trace_acquire_event *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
const struct perf_sample *sample);

void (*acquired_event)(struct trace_acquired_event *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
const struct perf_sample *sample);

void (*contended_event)(struct trace_contended_event *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
const struct perf_sample *sample);

void (*release_event)(struct trace_release_event *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
const struct perf_sample *sample);
};

static struct lock_seq_stat *get_seq(struct thread_stat *ts, void *addr)
Expand Down Expand Up @@ -417,10 +405,7 @@ enum acquire_flags {

static void
report_lock_acquire_event(struct trace_acquire_event *acquire_event,
struct event_format *__event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
const struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
Expand All @@ -430,7 +415,7 @@ report_lock_acquire_event(struct trace_acquire_event *acquire_event,
if (ls->discard)
return;

ts = thread_stat_findnew(thread->pid);
ts = thread_stat_findnew(sample->tid);
seq = get_seq(ts, acquire_event->addr);

switch (seq->state) {
Expand Down Expand Up @@ -474,18 +459,16 @@ report_lock_acquire_event(struct trace_acquire_event *acquire_event,
}

ls->nr_acquire++;
seq->prev_event_time = timestamp;
seq->prev_event_time = sample->time;
end:
return;
}

static void
report_lock_acquired_event(struct trace_acquired_event *acquired_event,
struct event_format *__event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
const struct perf_sample *sample)
{
u64 timestamp = sample->time;
struct lock_stat *ls;
struct thread_stat *ts;
struct lock_seq_stat *seq;
Expand All @@ -495,7 +478,7 @@ report_lock_acquired_event(struct trace_acquired_event *acquired_event,
if (ls->discard)
return;

ts = thread_stat_findnew(thread->pid);
ts = thread_stat_findnew(sample->tid);
seq = get_seq(ts, acquired_event->addr);

switch (seq->state) {
Expand Down Expand Up @@ -537,10 +520,7 @@ report_lock_acquired_event(struct trace_acquired_event *acquired_event,

static void
report_lock_contended_event(struct trace_contended_event *contended_event,
struct event_format *__event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
const struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
Expand All @@ -550,7 +530,7 @@ report_lock_contended_event(struct trace_contended_event *contended_event,
if (ls->discard)
return;

ts = thread_stat_findnew(thread->pid);
ts = thread_stat_findnew(sample->tid);
seq = get_seq(ts, contended_event->addr);

switch (seq->state) {
Expand All @@ -577,17 +557,14 @@ report_lock_contended_event(struct trace_contended_event *contended_event,

seq->state = SEQ_STATE_CONTENDED;
ls->nr_contended++;
seq->prev_event_time = timestamp;
seq->prev_event_time = sample->time;
end:
return;
}

static void
report_lock_release_event(struct trace_release_event *release_event,
struct event_format *__event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
const struct perf_sample *sample)
{
struct lock_stat *ls;
struct thread_stat *ts;
Expand All @@ -597,7 +574,7 @@ report_lock_release_event(struct trace_release_event *release_event,
if (ls->discard)
return;

ts = thread_stat_findnew(thread->pid);
ts = thread_stat_findnew(sample->tid);
seq = get_seq(ts, release_event->addr);

switch (seq->state) {
Expand Down Expand Up @@ -646,14 +623,12 @@ static struct trace_lock_handler report_lock_ops = {

static struct trace_lock_handler *trace_handler;

static void
process_lock_acquire_event(void *data,
struct event_format *event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
static void perf_evsel__process_lock_acquire(struct perf_evsel *evsel,
struct perf_sample *sample)
{
struct trace_acquire_event acquire_event;
struct event_format *event = evsel->tp_format;
void *data = sample->raw_data;
u64 tmp; /* this is required for casting... */

tmp = raw_field_value(event, "lockdep_addr", data);
Expand All @@ -662,76 +637,70 @@ process_lock_acquire_event(void *data,
acquire_event.flag = (int)raw_field_value(event, "flag", data);

if (trace_handler->acquire_event)
trace_handler->acquire_event(&acquire_event, event, cpu, timestamp, thread);
trace_handler->acquire_event(&acquire_event, sample);
}

static void
process_lock_acquired_event(void *data,
struct event_format *event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
static void perf_evsel__process_lock_acquired(struct perf_evsel *evsel,
struct perf_sample *sample)
{
struct trace_acquired_event acquired_event;
struct event_format *event = evsel->tp_format;
void *data = sample->raw_data;
u64 tmp; /* this is required for casting... */

tmp = raw_field_value(event, "lockdep_addr", data);
memcpy(&acquired_event.addr, &tmp, sizeof(void *));
acquired_event.name = (char *)raw_field_ptr(event, "name", data);

if (trace_handler->acquire_event)
trace_handler->acquired_event(&acquired_event, event, cpu, timestamp, thread);
trace_handler->acquired_event(&acquired_event, sample);
}

static void
process_lock_contended_event(void *data,
struct event_format *event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
static void perf_evsel__process_lock_contended(struct perf_evsel *evsel,
struct perf_sample *sample)
{
struct trace_contended_event contended_event;
struct event_format *event = evsel->tp_format;
void *data = sample->raw_data;
u64 tmp; /* this is required for casting... */

tmp = raw_field_value(event, "lockdep_addr", data);
memcpy(&contended_event.addr, &tmp, sizeof(void *));
contended_event.name = (char *)raw_field_ptr(event, "name", data);

if (trace_handler->acquire_event)
trace_handler->contended_event(&contended_event, event, cpu, timestamp, thread);
trace_handler->contended_event(&contended_event, sample);
}

static void
process_lock_release_event(void *data,
struct event_format *event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
static void perf_evsel__process_lock_release(struct perf_evsel *evsel,
struct perf_sample *sample)
{
struct trace_release_event release_event;
struct event_format *event = evsel->tp_format;
void *data = sample->raw_data;
u64 tmp; /* this is required for casting... */

tmp = raw_field_value(event, "lockdep_addr", data);
memcpy(&release_event.addr, &tmp, sizeof(void *));
release_event.name = (char *)raw_field_ptr(event, "name", data);

if (trace_handler->acquire_event)
trace_handler->release_event(&release_event, event, cpu, timestamp, thread);
trace_handler->release_event(&release_event, sample);
}

static void process_raw_event(struct perf_evsel *evsel, void *data, int cpu,
u64 timestamp, struct thread *thread)
static void perf_evsel__process_lock_event(struct perf_evsel *evsel,
struct perf_sample *sample)
{
struct event_format *event = evsel->tp_format;

if (!strcmp(event->name, "lock_acquire"))
process_lock_acquire_event(data, event, cpu, timestamp, thread);
perf_evsel__process_lock_acquire(evsel, sample);
if (!strcmp(event->name, "lock_acquired"))
process_lock_acquired_event(data, event, cpu, timestamp, thread);
perf_evsel__process_lock_acquired(evsel, sample);
if (!strcmp(event->name, "lock_contended"))
process_lock_contended_event(data, event, cpu, timestamp, thread);
perf_evsel__process_lock_contended(evsel, sample);
if (!strcmp(event->name, "lock_release"))
process_lock_release_event(data, event, cpu, timestamp, thread);
perf_evsel__process_lock_release(evsel, sample);
}

static void print_bad_events(int bad, int total)
Expand Down Expand Up @@ -857,8 +826,7 @@ static int process_sample_event(struct perf_tool *tool __used,
return -1;
}

process_raw_event(evsel, sample->raw_data, sample->cpu, sample->time, thread);

perf_evsel__process_lock_event(evsel, sample);
return 0;
}

Expand Down

0 comments on commit 01d9552

Please sign in to comment.