diff options
author | Namhoon Kim <namhoonk@cs.unc.edu> | 2015-01-24 05:22:15 -0500 |
---|---|---|
committer | Namhoon Kim <namhoonk@cs.unc.edu> | 2015-01-24 05:22:15 -0500 |
commit | 34fe51ed2dc210e87bfa5d85ab98c5125495f002 (patch) | |
tree | a7311067c4aa6bf4e1e66e2120dcbce655ac9429 | |
parent | 5be3aecdd4b8b0beb981cc0f7fc84b0d0ded2c47 (diff) |
Removed ghost_timerwip-mc2-lvc
-rw-r--r-- | litmus/sched_mc2.c | 12 |
1 files 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 { | |||
25 | struct crit_entry { | 25 | struct crit_entry { |
26 | enum crit_level level; | 26 | enum crit_level level; |
27 | struct task_struct *running; | 27 | struct task_struct *running; |
28 | struct hrtimer ghost_timer; | 28 | //struct hrtimer ghost_timer; |
29 | }; | 29 | }; |
30 | 30 | ||
31 | struct mc2_cpu_state { | 31 | struct mc2_cpu_state { |
@@ -80,7 +80,7 @@ static void task_departs(struct task_struct *tsk, int job_complete) | |||
80 | ce->running = tsk; | 80 | ce->running = tsk; |
81 | TRACE_TASK(tsk, "BECOME GHOST at %llu\n", litmus_clock()); | 81 | TRACE_TASK(tsk, "BECOME GHOST at %llu\n", litmus_clock()); |
82 | 82 | ||
83 | BUG_ON(hrtimer_active(&ce->ghost_timer)); | 83 | //BUG_ON(hrtimer_active(&ce->ghost_timer)); |
84 | //TRACE("setting GHOST timer %llu\n", ns_to_ktime(now + res->cur_budget)); | 84 | //TRACE("setting GHOST timer %llu\n", ns_to_ktime(now + res->cur_budget)); |
85 | //__hrtimer_start_range_ns(&ce->ghost_timer, ns_to_ktime(now + res->cur_budget), 0, HRTIMER_MODE_ABS_PINNED, 0); | 85 | //__hrtimer_start_range_ns(&ce->ghost_timer, ns_to_ktime(now + res->cur_budget), 0, HRTIMER_MODE_ABS_PINNED, 0); |
86 | } | 86 | } |
@@ -181,6 +181,7 @@ static void mc2_update_ghost_state(struct mc2_cpu_state *state) | |||
181 | } | 181 | } |
182 | } | 182 | } |
183 | 183 | ||
184 | /* | ||
184 | static enum hrtimer_restart on_ghost_timer(struct hrtimer *timer) | 185 | static enum hrtimer_restart on_ghost_timer(struct hrtimer *timer) |
185 | { | 186 | { |
186 | struct crit_entry *ce; | 187 | struct crit_entry *ce; |
@@ -199,7 +200,8 @@ static enum hrtimer_restart on_ghost_timer(struct hrtimer *timer) | |||
199 | 200 | ||
200 | return HRTIMER_NORESTART; | 201 | return HRTIMER_NORESTART; |
201 | } | 202 | } |
202 | 203 | */ | |
204 | |||
203 | static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer) | 205 | static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer) |
204 | { | 206 | { |
205 | unsigned long flags; | 207 | unsigned long flags; |
@@ -863,8 +865,8 @@ static long mc2_activate_plugin(void) | |||
863 | struct crit_entry *ce = &state->crit_entries[lv]; | 865 | struct crit_entry *ce = &state->crit_entries[lv]; |
864 | ce->level = lv; | 866 | ce->level = lv; |
865 | ce->running = NULL; | 867 | ce->running = NULL; |
866 | hrtimer_init(&ce->ghost_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); | 868 | //hrtimer_init(&ce->ghost_timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS_PINNED); |
867 | ce->ghost_timer.function = on_ghost_timer; | 869 | //ce->ghost_timer.function = on_ghost_timer; |
868 | } | 870 | } |
869 | sup_init(&state->sup_env); | 871 | sup_init(&state->sup_env); |
870 | 872 | ||