Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history 
yaml
---
r: 323638
b: refs/heads/master
c: 7f7f8d0
h: refs/heads/master
v: v3
  • Loading branch information
Arnaldo Carvalho de Melo committed Aug 8, 2012
1 parent 19d5ffb commit 30aad92
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 77 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: 01d955244b99827814570ed4b675271ca7b8af02
refs/heads/master: 7f7f8d0bea5d6bb985f4ae84ca3daff34802fd32
113 changes: 37 additions & 76 deletions trunk/tools/perf/builtin-sched.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -729,46 +729,30 @@ struct trace_sched_handler {
void (*switch_event)(struct trace_switch_event *,
struct machine *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
struct perf_sample *sample);

void (*runtime_event)(struct trace_runtime_event *,
struct machine *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
struct perf_sample *sample);

void (*wakeup_event)(struct trace_wakeup_event *,
struct machine *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
struct perf_sample *sample);

void (*fork_event)(struct trace_fork_event *,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
struct event_format *event);

void (*migrate_task_event)(struct trace_migrate_task_event *,
struct machine *machine,
struct event_format *,
int cpu,
u64 timestamp,
struct thread *thread);
struct machine *machine,
struct perf_sample *sample);
};


static void
replay_wakeup_event(struct trace_wakeup_event *wakeup_event,
struct machine *machine __used,
struct event_format *event,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
struct event_format *event, struct perf_sample *sample)
{
struct task_desc *waker, *wakee;

Expand All @@ -784,7 +768,7 @@ replay_wakeup_event(struct trace_wakeup_event *wakeup_event,
waker = register_pid(wakeup_event->common_pid, "<unknown>");
wakee = register_pid(wakeup_event->pid, wakeup_event->comm);

add_sched_event_wakeup(waker, timestamp, wakee);
add_sched_event_wakeup(waker, sample->time, wakee);
}

static u64 cpu_last_switched[MAX_CPUS];
Expand All @@ -793,12 +777,11 @@ static void
replay_switch_event(struct trace_switch_event *switch_event,
struct machine *machine __used,
struct event_format *event,
int cpu,
u64 timestamp,
struct thread *thread __used)
struct perf_sample *sample)
{
struct task_desc *prev, __used *next;
u64 timestamp0;
u64 timestamp0, timestamp = sample->time;
int cpu = sample->cpu;
s64 delta;

if (verbose)
Expand Down Expand Up @@ -835,10 +818,7 @@ replay_switch_event(struct trace_switch_event *switch_event,

static void
replay_fork_event(struct trace_fork_event *fork_event,
struct event_format *event,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
struct event_format *event)
{
if (verbose) {
printf("sched_fork event %p\n", event);
Expand Down Expand Up @@ -944,10 +924,7 @@ static void thread_atoms_insert(struct thread *thread)

static void
latency_fork_event(struct trace_fork_event *fork_event __used,
struct event_format *event __used,
int cpu __used,
u64 timestamp __used,
struct thread *thread __used)
struct event_format *event __used)
{
/* should insert the newcomer */
}
Expand Down Expand Up @@ -1027,13 +1004,12 @@ static void
latency_switch_event(struct trace_switch_event *switch_event,
struct machine *machine,
struct event_format *event __used,
int cpu,
u64 timestamp,
struct thread *thread __used)
struct perf_sample *sample)
{
struct work_atoms *out_events, *in_events;
struct thread *sched_out, *sched_in;
u64 timestamp0;
u64 timestamp0, timestamp = sample->time;
int cpu = sample->cpu;
s64 delta;

BUG_ON(cpu >= MAX_CPUS || cpu < 0);
Expand Down Expand Up @@ -1078,14 +1054,12 @@ latency_switch_event(struct trace_switch_event *switch_event,

static void
latency_runtime_event(struct trace_runtime_event *runtime_event,
struct machine *machine,
struct event_format *event __used,
int cpu,
u64 timestamp,
struct thread *this_thread __used)
struct machine *machine, struct perf_sample *sample)
{
struct thread *thread = machine__findnew_thread(machine, runtime_event->pid);
struct work_atoms *atoms = thread_atoms_search(&atom_root, thread, &cmp_pid);
u64 timestamp = sample->time;
int cpu = sample->cpu;

BUG_ON(cpu >= MAX_CPUS || cpu < 0);
if (!atoms) {
Expand All @@ -1101,15 +1075,13 @@ latency_runtime_event(struct trace_runtime_event *runtime_event,

static void
latency_wakeup_event(struct trace_wakeup_event *wakeup_event,
struct machine *machine,
struct event_format *__event __used,
int cpu __used,
u64 timestamp,
struct thread *thread __used)
struct machine *machine, struct event_format *event __used,
struct perf_sample *sample)
{
struct work_atoms *atoms;
struct work_atom *atom;
struct thread *wakee;
u64 timestamp = sample->time;

/* Note for later, it may be interesting to observe the failing cases */
if (!wakeup_event->success)
Expand Down Expand Up @@ -1149,12 +1121,9 @@ latency_wakeup_event(struct trace_wakeup_event *wakeup_event,

static void
latency_migrate_task_event(struct trace_migrate_task_event *migrate_task_event,
struct machine *machine,
struct event_format *__event __used,
int cpu __used,
u64 timestamp,
struct thread *thread __used)
struct machine *machine, struct perf_sample *sample)
{
u64 timestamp = sample->time;
struct work_atoms *atoms;
struct work_atom *atom;
struct thread *migrant;
Expand Down Expand Up @@ -1364,7 +1333,7 @@ process_sched_wakeup_event(struct perf_tool *tool __used,
struct event_format *event,
struct perf_sample *sample,
struct machine *machine,
struct thread *thread)
struct thread *thread __used)
{
void *data = sample->raw_data;
struct trace_wakeup_event wakeup_event;
Expand All @@ -1378,8 +1347,7 @@ process_sched_wakeup_event(struct perf_tool *tool __used,
FILL_FIELD(wakeup_event, cpu, event, data);

if (trace_handler->wakeup_event)
trace_handler->wakeup_event(&wakeup_event, machine, event,
sample->cpu, sample->time, thread);
trace_handler->wakeup_event(&wakeup_event, machine, event, sample);
}

/*
Expand All @@ -1399,15 +1367,13 @@ static void
map_switch_event(struct trace_switch_event *switch_event,
struct machine *machine,
struct event_format *event __used,
int this_cpu,
u64 timestamp,
struct thread *thread __used)
struct perf_sample *sample)
{
struct thread *sched_out __used, *sched_in;
int new_shortname;
u64 timestamp0;
u64 timestamp0, timestamp = sample->time;
s64 delta;
int cpu;
int cpu, this_cpu = sample->cpu;

BUG_ON(this_cpu >= MAX_CPUS || this_cpu < 0);

Expand Down Expand Up @@ -1479,7 +1445,7 @@ process_sched_switch_event(struct perf_tool *tool __used,
struct event_format *event,
struct perf_sample *sample,
struct machine *machine,
struct thread *thread)
struct thread *thread __used)
{
int this_cpu = sample->cpu;
void *data = sample->raw_data;
Expand All @@ -1504,8 +1470,7 @@ process_sched_switch_event(struct perf_tool *tool __used,
nr_context_switch_bugs++;
}
if (trace_handler->switch_event)
trace_handler->switch_event(&switch_event, machine, event,
this_cpu, sample->time, thread);
trace_handler->switch_event(&switch_event, machine, event, sample);

curr_pid[this_cpu] = switch_event.next_pid;
}
Expand All @@ -1515,7 +1480,7 @@ process_sched_runtime_event(struct perf_tool *tool __used,
struct event_format *event,
struct perf_sample *sample,
struct machine *machine,
struct thread *thread)
struct thread *thread __used)
{
void *data = sample->raw_data;
struct trace_runtime_event runtime_event;
Expand All @@ -1526,16 +1491,15 @@ process_sched_runtime_event(struct perf_tool *tool __used,
FILL_FIELD(runtime_event, vruntime, event, data);

if (trace_handler->runtime_event)
trace_handler->runtime_event(&runtime_event, machine, event,
sample->cpu, sample->time, thread);
trace_handler->runtime_event(&runtime_event, machine, sample);
}

static void
process_sched_fork_event(struct perf_tool *tool __used,
struct event_format *event,
struct perf_sample *sample,
struct machine *machine __used,
struct thread *thread)
struct thread *thread __used)
{
void *data = sample->raw_data;
struct trace_fork_event fork_event;
Expand All @@ -1548,8 +1512,7 @@ process_sched_fork_event(struct perf_tool *tool __used,
FILL_FIELD(fork_event, child_pid, event, data);

if (trace_handler->fork_event)
trace_handler->fork_event(&fork_event, event,
sample->cpu, sample->time, thread);
trace_handler->fork_event(&fork_event, event);
}

static void
Expand All @@ -1568,7 +1531,7 @@ process_sched_migrate_task_event(struct perf_tool *tool __used,
struct event_format *event,
struct perf_sample *sample,
struct machine *machine,
struct thread *thread)
struct thread *thread __used)
{
void *data = sample->raw_data;
struct trace_migrate_task_event migrate_task_event;
Expand All @@ -1581,9 +1544,7 @@ process_sched_migrate_task_event(struct perf_tool *tool __used,
FILL_FIELD(migrate_task_event, cpu, event, data);

if (trace_handler->migrate_task_event)
trace_handler->migrate_task_event(&migrate_task_event, machine,
event, sample->cpu,
sample->time, thread);
trace_handler->migrate_task_event(&migrate_task_event, machine, sample);
}

typedef void (*tracepoint_handler)(struct perf_tool *tool, struct event_format *event,
Expand Down

0 comments on commit 30aad92

Please sign in to comment.