mode 0 fix

2 files changed, 18 insertions, 46 deletions

diff --git a/litmus/Kconfig b/litmus/Kconfig
index babb43deffb5..2253be5e74eb 100644
--- a/litmus/Kconfig
+++ b/litmus/Kconfig
@@ -243,7 +243,7 @@ config SCHED_TASK_TRACE
 config SCHED_TASK_TRACE_SHIFT
        int "Buffer size for sched_trace_xxx() events"
        depends on SCHED_TASK_TRACE
-       range 8 13
+       range 8 14
        default 9
        help
 
diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index a000242d5045..415e5fe3bf12 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -923,18 +923,20 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
                                 } else {
                                         //if (!is_init_finished(tsk)) {
                                         TRACE_TASK(tsk, "num_sync_released = %d, mode = %d\n", num_sync_released, mode);
-                                        if (num_sync_released != 0 && mode == 0) {
-                                                //ce = &state->crit_entries[lv];
-                                                sup_scheduler_update_after(sup_env, res->cur_budget);
-                                                res->blocked_by_ghost = 0;
-                                                res->is_ghost = NO_CPU;
-                                                return tsk;
+//                                      if (num_sync_released != 0 && mode == 0) {
+                                        //ce = &state->crit_entries[lv];
+                                        sup_scheduler_update_after(sup_env, res->cur_budget);
+                                        res->blocked_by_ghost = 0;
+                                        res->is_ghost = NO_CPU;
+                                        return tsk;
+/*
                                         } else if (res->mode == mode) {
                                                 sup_scheduler_update_after(sup_env, res->cur_budget);
                                                 res->blocked_by_ghost = 0;
                                                 res->is_ghost = NO_CPU;
                                                 return tsk;
                                         }
+*/                                      
                                 }
                         }
                 }
@@ -961,47 +963,17 @@ struct task_struct* mc2_global_dispatch(struct mc2_cpu_state* state)
                         }
                         if (likely(tsk)) {
                                 lv = get_task_crit_level(tsk);
-                                if (lv == NUM_CRIT_LEVELS) {
+                                if (lv != CRIT_LEVEL_C)
+                                        BUG();
 #if BUDGET_ENFORCEMENT_AT_C                     
-                                        gmp_add_event_after(_global_env, res->cur_budget, res->id, EVENT_DRAIN);
-#endif
-                                        res->event_added = 1;
-                                        res->blocked_by_ghost = 0;
-                                        res->is_ghost = NO_CPU;
-                                        res->scheduled_on = state->cpu;
-                                        raw_spin_unlock(&mode_lock);
-                                        return tsk;
-                                } else {
-                                                //if (!is_init_finished(tsk)) {
-                                                if (num_sync_released != 0 && mode == 0) {
-                                        //ce = &state->crit_entries[lv];
-                                        //if (likely(!ce->running)) {
-#if BUDGET_ENFORCEMENT_AT_C
-                                                        gmp_add_event_after(_global_env, res->cur_budget, res->id, EVENT_DRAIN);
-#endif
-                                                        res->event_added = 1;
-                                                        res->blocked_by_ghost = 0;
-                                                        res->is_ghost = NO_CPU;
-                                                        res->scheduled_on = state->cpu;
-                                                        raw_spin_unlock(&mode_lock);
-                                                        return tsk;
-                                                } else if (res->mode == mode) {
-#if BUDGET_ENFORCEMENT_AT_C
-                                                        gmp_add_event_after(_global_env, res->cur_budget, res->id, EVENT_DRAIN);
+                                gmp_add_event_after(_global_env, res->cur_budget, res->id, EVENT_DRAIN);
 #endif
-                                                        res->event_added = 1;
-                                                        res->blocked_by_ghost = 0;
-                                                        res->is_ghost = NO_CPU;
-                                                        res->scheduled_on = state->cpu;
-                                                        raw_spin_unlock(&mode_lock);
-                                                        return tsk;
-                                                }
-                                        //} else {
-                                        //      res->blocked_by_ghost = 1;
-                                        //      TRACE_TASK(ce->running, " is GHOST\n");
-                                        //      return NULL;
-                                        //}
-                                }
+                                res->event_added = 1;
+                                res->blocked_by_ghost = 0;
+                                res->is_ghost = NO_CPU;
+                                res->scheduled_on = state->cpu;
+                                raw_spin_unlock(&mode_lock);
+                                return tsk;
                         }
                 }
         }