From 34fe51ed2dc210e87bfa5d85ab98c5125495f002 Mon Sep 17 00:00:00 2001 From: Namhoon Kim Date: Sat, 24 Jan 2015 05:22:15 -0500 Subject: Removed ghost_timer --- litmus/sched_mc2.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c index 6b29d527fa3a..499f770a87d3 100644 --- a/litmus/sched_mc2.c +++ b/litmus/sched_mc2.c @@ -25,7 +25,7 @@ struct mc2_task_state { struct crit_entry { enum crit_level level; struct task_struct *running; - struct hrtimer ghost_timer; + //struct hrtimer ghost_timer; }; struct mc2_cpu_state { @@ -80,7 +80,7 @@ static void task_departs(struct task_struct *tsk, int job_complete) ce->running = tsk; TRACE_TASK(tsk, "BECOME GHOST at %llu\n", litmus_clock()); - BUG_ON(hrtimer_active(&ce->ghost_timer)); + //BUG_ON(hrtimer_active(&ce->ghost_timer)); //TRACE("setting GHOST timer %llu\n", ns_to_ktime(now + res->cur_budget)); //__hrtimer_start_range_ns(&ce->ghost_timer, ns_to_ktime(now + res->cur_budget), 0, HRTIMER_MODE_ABS_PINNED, 0); } @@ -181,6 +181,7 @@ static void mc2_update_ghost_state(struct mc2_cpu_state *state) } } +/* static enum hrtimer_restart on_ghost_timer(struct hrtimer *timer) { struct crit_entry *ce; @@ -199,7 +200,8 @@ static enum hrtimer_restart on_ghost_timer(struct hrtimer *timer) return HRTIMER_NORESTART; } - +*/ + static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer) { unsigned long flags; @@ -863,8 +865,8 @@ static long mc2_activate_plugin(void) struct crit_entry *ce = &state->crit_entries[lv]; ce->level = lv; ce->running = NULL; - hrtimer_init(&ce->ghost_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); - ce->ghost_timer.function = on_ghost_timer; + //hrtimer_init(&ce->ghost_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); + //ce->ghost_timer.function = on_ghost_timer; } sup_init(&state->sup_env); -- cgit v1.2.2