perf_events: generalize use of event_filter_match() (v6)
PATCH 2/5 perf_events: generalize use of event_filter_match() (v6)
Replace all occurrences of:
event->cpu != -1 && event->cpu == smp_processor_id()
by a call to:
event_filter_match(event)
This makes the code more consistent and will make the cgroup patch smaller.
Signed-off-by Stephane Eranian <[email protected]>
---
kernel/perf_event.c +8 -8
@@ -838,7 +838,7 @@ static void __perf_install_in_context(void *info)add_event_to_ctx (event, ctx); -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event)) goto unlock;/*
@@ -983,7 +983,7 @@ static void __perf_event_enable(void *info) goto unlock;__perf_event_mark_enabled (event, ctx); -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event)) goto unlock;/*
@@ -1330,7 +1330,7 @@ ctx_pinned_sched_in(struct perf_event_context *ctx,list_for_each_entry (event, &ctx->pinned_groups, group_entry) {if (event->state <=PERF_EVENT_STATE_OFF )continue ; -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event))continue ;if (group_can_go_on (event, cpuctx,1 ))
@@ -1362,7 +1362,7 @@ ctx_flexible_sched_in(struct perf_event_context *ctx,* Listen to the 'cpu' scheduling filter constraint * of events: */ -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event))continue ;if (group_can_go_on (event, cpuctx, can_add_hw)) {
@@ -1589,7 +1589,7 @@ static void perf_ctx_adjust_freq(struct perf_event_context *ctx, u64 period)if (event->state !=PERF_EVENT_STATE_ACTIVE )continue ; -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event))continue ; hwc = &event->hw;
@@ -3799,7 +3799,7 @@ static int perf_event_task_match(struct perf_event *event)if (event->state <PERF_EVENT_STATE_INACTIVE )return 0 ; -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event))return 0 ; if (event->attr.comm || event->attr.mmap ||
@@ -3924,7 +3924,7 @@ static int perf_event_comm_match(struct perf_event *event)if (event->state <PERF_EVENT_STATE_INACTIVE )return 0 ; -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event))return 0 ;if (event->attr.comm)
@@ -4062,7 +4062,7 @@ static int perf_event_mmap_match(struct perf_event *event,if (event->state <PERF_EVENT_STATE_INACTIVE )return 0 ; -if (event->cpu !=-1 && event->cpu !=smp_processor_id ()) +if (!event_filter_match (event))return 0 ; if ((!executable && event->attr.mmap_data) ||