Skip to content

Commit

Permalink
perf script: Stop using pevent directly
Browse files Browse the repository at this point in the history 
We can get all that is needed using just event_format, that is available
via evsel->tp_format now.

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-2hsr1686epa9f0vx4yg7z2zj@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 7f7f8d0 commit 9782243
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 47 deletions.
48 changes: 17 additions & 31 deletions tools/perf/builtin-script.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ static bool system_wide;
static const char *cpu_list;
static DECLARE_BITMAP(cpu_bitmap, MAX_NR_CPUS);

struct perf_script {
struct perf_tool tool;
struct perf_session *session;
};

enum perf_output_field {
PERF_OUTPUT_COMM = 1U << 0,
PERF_OUTPUT_TID = 1U << 1,
Expand Down Expand Up @@ -399,11 +394,8 @@ static void print_sample_bts(union perf_event *event,
printf("\n");
}

static void process_event(union perf_event *event __unused,
struct pevent *pevent __unused,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine,
static void process_event(union perf_event *event, struct perf_sample *sample,
struct perf_evsel *evsel, struct machine *machine,
struct thread *thread)
{
struct perf_event_attr *attr = &evsel->attr;
Expand Down Expand Up @@ -488,7 +480,6 @@ static int process_sample_event(struct perf_tool *tool __used,
struct machine *machine)
{
struct addr_location al;
struct perf_script *scr = container_of(tool, struct perf_script, tool);
struct thread *thread = machine__findnew_thread(machine, event->ip.tid);

if (thread == NULL) {
Expand Down Expand Up @@ -520,27 +511,24 @@ static int process_sample_event(struct perf_tool *tool __used,
if (cpu_list && !test_bit(sample->cpu, cpu_bitmap))
return 0;

scripting_ops->process_event(event, scr->session->pevent,
sample, evsel, machine, thread);
scripting_ops->process_event(event, sample, evsel, machine, thread);

evsel->hists.stats.total_period += sample->period;
return 0;
}

static struct perf_script perf_script = {
.tool = {
.sample = process_sample_event,
.mmap = perf_event__process_mmap,
.comm = perf_event__process_comm,
.exit = perf_event__process_task,
.fork = perf_event__process_task,
.attr = perf_event__process_attr,
.event_type = perf_event__process_event_type,
.tracing_data = perf_event__process_tracing_data,
.build_id = perf_event__process_build_id,
.ordered_samples = true,
.ordering_requires_timestamps = true,
},
static struct perf_tool perf_script = {
.sample = process_sample_event,
.mmap = perf_event__process_mmap,
.comm = perf_event__process_comm,
.exit = perf_event__process_task,
.fork = perf_event__process_task,
.attr = perf_event__process_attr,
.event_type = perf_event__process_event_type,
.tracing_data = perf_event__process_tracing_data,
.build_id = perf_event__process_build_id,
.ordered_samples = true,
.ordering_requires_timestamps = true,
};

extern volatile int session_done;
Expand All @@ -556,7 +544,7 @@ static int __cmd_script(struct perf_session *session)

signal(SIGINT, sig_handler);

ret = perf_session__process_events(session, &perf_script.tool);
ret = perf_session__process_events(session, &perf_script);

if (debug_mode)
pr_err("Misordered timestamps: %" PRIu64 "\n", nr_unordered);
Expand Down Expand Up @@ -1339,12 +1327,10 @@ int cmd_script(int argc, const char **argv, const char *prefix __used)
setup_pager();

session = perf_session__new(input_name, O_RDONLY, 0, false,
&perf_script.tool);
&perf_script);
if (session == NULL)
return -ENOMEM;

perf_script.session = session;

if (cpu_list) {
if (perf_session__cpu_bitmap(session, cpu_list, cpu_bitmap))
return -1;
Expand Down
14 changes: 6 additions & 8 deletions tools/perf/util/scripting-engines/trace-event-perl.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,6 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
}

static void perl_process_tracepoint(union perf_event *perf_event __unused,
struct pevent *pevent,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine __unused,
Expand All @@ -284,7 +283,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __unused,
if (!event)
die("ug! no event found for type %d", evsel->attr.config);

pid = trace_parse_common_pid(pevent, data);
pid = raw_field_value(event, "common_pid", data);

sprintf(handler, "%s::%s", event->system, event->name);

Expand Down Expand Up @@ -317,7 +316,7 @@ static void perl_process_tracepoint(union perf_event *perf_event __unused,
offset = field->offset;
XPUSHs(sv_2mortal(newSVpv((char *)data + offset, 0)));
} else { /* FIELD_IS_NUMERIC */
val = read_size(pevent, data + field->offset,
val = read_size(event, data + field->offset,
field->size);
if (field->flags & FIELD_IS_SIGNED) {
XPUSHs(sv_2mortal(newSViv(val)));
Expand Down Expand Up @@ -346,9 +345,9 @@ static void perl_process_tracepoint(union perf_event *perf_event __unused,
LEAVE;
}

static void perl_process_event_generic(union perf_event *pevent __unused,
static void perl_process_event_generic(union perf_event *event,
struct perf_sample *sample,
struct perf_evsel *evsel __unused,
struct perf_evsel *evsel,
struct machine *machine __unused,
struct thread *thread __unused)
{
Expand All @@ -360,7 +359,7 @@ static void perl_process_event_generic(union perf_event *pevent __unused,
ENTER;
SAVETMPS;
PUSHMARK(SP);
XPUSHs(sv_2mortal(newSVpvn((const char *)pevent, pevent->header.size)));
XPUSHs(sv_2mortal(newSVpvn((const char *)event, event->header.size)));
XPUSHs(sv_2mortal(newSVpvn((const char *)&evsel->attr, sizeof(evsel->attr))));
XPUSHs(sv_2mortal(newSVpvn((const char *)sample, sizeof(*sample))));
XPUSHs(sv_2mortal(newSVpvn((const char *)sample->raw_data, sample->raw_size)));
Expand All @@ -373,13 +372,12 @@ static void perl_process_event_generic(union perf_event *pevent __unused,
}

static void perl_process_event(union perf_event *event,
struct pevent *pevent,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine,
struct thread *thread)
{
perl_process_tracepoint(event, pevent, sample, evsel, machine, thread);
perl_process_tracepoint(event, sample, evsel, machine, thread);
perl_process_event_generic(event, sample, evsel, machine, thread);
}

Expand Down
5 changes: 2 additions & 3 deletions tools/perf/util/scripting-engines/trace-event-python.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,6 @@ static inline struct event_format *find_cache_event(struct perf_evsel *evsel)
}

static void python_process_event(union perf_event *perf_event __unused,
struct pevent *pevent,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine __unused,
Expand All @@ -248,7 +247,7 @@ static void python_process_event(union perf_event *perf_event __unused,
if (!event)
die("ug! no event found for type %d", (int)evsel->attr.config);

pid = trace_parse_common_pid(pevent, data);
pid = raw_field_value(event, "common_pid", data);

sprintf(handler_name, "%s__%s", event->system, event->name);

Expand Down Expand Up @@ -293,7 +292,7 @@ static void python_process_event(union perf_event *perf_event __unused,
offset = field->offset;
obj = PyString_FromString((char *)data + offset);
} else { /* FIELD_IS_NUMERIC */
val = read_size(pevent, data + field->offset,
val = read_size(event, data + field->offset,
field->size);
if (field->flags & FIELD_IS_SIGNED) {
if ((long long)val >= LONG_MIN &&
Expand Down
4 changes: 2 additions & 2 deletions tools/perf/util/trace-event-parse.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,9 +162,9 @@ int trace_parse_common_pid(struct pevent *pevent, void *data)
return pevent_data_pid(pevent, &record);
}

unsigned long long read_size(struct pevent *pevent, void *ptr, int size)
unsigned long long read_size(struct event_format *event, void *ptr, int size)
{
return pevent_read_number(pevent, ptr, size);
return pevent_read_number(event->pevent, ptr, size);
}

void event_format__print(struct event_format *event,
Expand Down
1 change: 0 additions & 1 deletion tools/perf/util/trace-event-scripting.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ static int stop_script_unsupported(void)
}

static void process_event_unsupported(union perf_event *event __unused,
struct pevent *pevent __unused,
struct perf_sample *sample __unused,
struct perf_evsel *evsel __unused,
struct machine *machine __unused,
Expand Down
3 changes: 1 addition & 2 deletions tools/perf/util/trace-event.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ int trace_parse_common_pid(struct pevent *pevent, void *data);

struct event_format *trace_find_next_event(struct pevent *pevent,
struct event_format *event);
unsigned long long read_size(struct pevent *pevent, void *ptr, int size);
unsigned long long read_size(struct event_format *event, void *ptr, int size);
unsigned long long eval_flag(const char *flag);

struct pevent_record *trace_read_data(struct pevent *pevent, int cpu);
Expand All @@ -81,7 +81,6 @@ struct scripting_ops {
int (*start_script) (const char *script, int argc, const char **argv);
int (*stop_script) (void);
void (*process_event) (union perf_event *event,
struct pevent *pevent,
struct perf_sample *sample,
struct perf_evsel *evsel,
struct machine *machine,
Expand Down

0 comments on commit 9782243

Please sign in to comment.