imrcpan/erofs-linux
1
0 Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git synced 2026-11-12 12:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

perf: Update shadow timestamp before add event

Browse Source 
Update the shadow timestamp before start event, because .add might
use the timestamp.

Signed-off-by: Shaohua Li <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Andy Lutomirski <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Arnaldo Carvalho de Melo <[email protected]>
Cc: Frederic Weisbecker <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Paul Mackerras <[email protected]>
Link: http://lkml.kernel.org/r/9cd0276d6a047cb7c2885994f25e3a1f7c8c28af.1423180257.git.shli@fb.com
Signed-off-by: Ingo Molnar <[email protected]>
This commit is contained in:
Shaohua Li authored and Ingo Molnar committed 2015-02-18 17:01:44 +01:00
1 parent 8e57c586c6
commit 72f669c008
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
kernel/events/core.c
+4 -4
View File
@@ -1881,6 +1881,10 @@ event_sched_in(struct perf_event *event,
perf_pmu_disable(event->pmu);
event->tstamp_running += tstamp - event->tstamp_stopped;
perf_set_shadow_time(event, ctx, tstamp);
if (event->pmu->add(event, PERF_EF_START)) {
event->state = PERF_EVENT_STATE_INACTIVE;
event->oncpu = -1;
@@ -1888,10 +1892,6 @@ event_sched_in(struct perf_event *event,
goto out;
}
event->tstamp_running += tstamp - event->tstamp_stopped;
perf_set_shadow_time(event, ctx, tstamp);
if (!is_software_event(event))
cpuctx->active_oncpu++;
if (!ctx->nr_active++)