Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit dce5855bba5df9e87bb04584d505c1f1b103c652

Authored by Peter Zijlstra
Committed by Ingo Molnar
1 parent db24d33e08
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

perf: Collect the schedule-in rules in one function 

This was scattered out - refactor it into a single function.
No change in functionality.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20110409192141.979862055@chello.nl
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 15 additions and 12 deletions Side-by-side Diff

kernel/events/core.c
Diff comments   View file @ dce5855
... ... @@ -1476,6 +1476,18 @@
1476 1476 enum event_type_t event_type,
1477 1477 struct task_struct *task);
1478 1478  
  1479 +static void perf_event_sched_in(struct perf_cpu_context *cpuctx,
  1480 + struct perf_event_context *ctx,
  1481 + struct task_struct *task)
  1482 +{
  1483 + cpu_ctx_sched_in(cpuctx, EVENT_PINNED, task);
  1484 + if (ctx)
  1485 + ctx_sched_in(ctx, cpuctx, EVENT_PINNED, task);
  1486 + cpu_ctx_sched_in(cpuctx, EVENT_FLEXIBLE, task);
  1487 + if (ctx)
  1488 + ctx_sched_in(ctx, cpuctx, EVENT_FLEXIBLE, task);
  1489 +}
  1490 +
1479 1491 /*
1480 1492 * Cross CPU call to install and enable a performance event
1481 1493 *
... ... @@ -1523,12 +1535,7 @@
1523 1535 /*
1524 1536 * Schedule everything back in
1525 1537 */
1526   - cpu_ctx_sched_in(cpuctx, EVENT_PINNED, task);
1527   - if (task_ctx)
1528   - ctx_sched_in(task_ctx, cpuctx, EVENT_PINNED, task);
1529   - cpu_ctx_sched_in(cpuctx, EVENT_FLEXIBLE, task);
1530   - if (task_ctx)
1531   - ctx_sched_in(task_ctx, cpuctx, EVENT_FLEXIBLE, task);
  1538 + perf_event_sched_in(cpuctx, task_ctx, task);
1532 1539  
1533 1540 perf_pmu_enable(cpuctx->ctx.pmu);
1534 1541 perf_ctx_unlock(cpuctx, task_ctx);
... ... @@ -2107,9 +2114,7 @@
2107 2114 */
2108 2115 cpu_ctx_sched_out(cpuctx, EVENT_FLEXIBLE);
2109 2116  
2110   - ctx_sched_in(ctx, cpuctx, EVENT_PINNED, task);
2111   - cpu_ctx_sched_in(cpuctx, EVENT_FLEXIBLE, task);
2112   - ctx_sched_in(ctx, cpuctx, EVENT_FLEXIBLE, task);
  2117 + perf_event_sched_in(cpuctx, ctx, task);
2113 2118  
2114 2119 cpuctx->task_ctx = ctx;
2115 2120  
... ... @@ -2347,9 +2352,7 @@
2347 2352 if (ctx)
2348 2353 rotate_ctx(ctx);
2349 2354  
2350   - cpu_ctx_sched_in(cpuctx, EVENT_FLEXIBLE, current);
2351   - if (ctx)
2352   - ctx_sched_in(ctx, cpuctx, EVENT_FLEXIBLE, current);
  2355 + perf_event_sched_in(cpuctx, ctx, current);
2353 2356  
2354 2357 done:
2355 2358 if (remove)