diff options
author | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2010-11-08 20:21:35 -0500 |
---|---|---|
committer | Bjoern B. Brandenburg <bbb@cs.unc.edu> | 2010-11-11 17:57:43 -0500 |
commit | 516b6601bb5f71035e8859735a25dea0da4a0211 (patch) | |
tree | 7bf709fb8bfa7f3a99e14d83a4b0386c8f30579a | |
parent | 34310fd7dbc3ad98d8e7cafa4f872ba71ca00860 (diff) |
hook litmus tick function into hrtimer-driven ticks
Litmus plugins should also be activated if ticks are triggered by
hrtimer.
-rw-r--r-- | kernel/sched.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 6777dc7942a0..a9dd6f96c731 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -82,6 +82,8 @@ | |||
82 | #include <litmus/sched_trace.h> | 82 | #include <litmus/sched_trace.h> |
83 | #include <litmus/trace.h> | 83 | #include <litmus/trace.h> |
84 | 84 | ||
85 | static void litmus_tick(struct rq*, struct task_struct*); | ||
86 | |||
85 | #define CREATE_TRACE_POINTS | 87 | #define CREATE_TRACE_POINTS |
86 | #include <trace/events/sched.h> | 88 | #include <trace/events/sched.h> |
87 | 89 | ||
@@ -1052,6 +1054,7 @@ static enum hrtimer_restart hrtick(struct hrtimer *timer) | |||
1052 | raw_spin_lock(&rq->lock); | 1054 | raw_spin_lock(&rq->lock); |
1053 | update_rq_clock(rq); | 1055 | update_rq_clock(rq); |
1054 | rq->curr->sched_class->task_tick(rq, rq->curr, 1); | 1056 | rq->curr->sched_class->task_tick(rq, rq->curr, 1); |
1057 | litmus_tick(rq, rq->curr); | ||
1055 | raw_spin_unlock(&rq->lock); | 1058 | raw_spin_unlock(&rq->lock); |
1056 | 1059 | ||
1057 | return HRTIMER_NORESTART; | 1060 | return HRTIMER_NORESTART; |