1 files changed, 84 insertions, 69 deletions

diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index 3b407bd780d0..0c9bb1812367 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -38,7 +38,7 @@
 
 #define BUDGET_ENFORCEMENT_AT_C 0
 
-extern int num_sync_released;
+extern atomic_t num_sync_released;
 extern void do_partition(enum crit_level lv, int cpu);
 
 /* _global_env - reservation container for level-C tasks*/
@@ -147,8 +147,8 @@ asmlinkage long sys_enact_mode(void)
                         }
                 }
                 mode_changed = false;
-                local_irq_save(flags);
-                if (pending){ //MCR has entered 
+                if (pending){ //MCR has entered
+                        local_irq_save(flags);
                         raw_spin_lock(&state->lock);
                         //TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");
                         raw_spin_lock(&global_lock);
@@ -256,10 +256,11 @@ asmlinkage long sys_enact_mode(void)
                         //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
                         raw_spin_unlock(&global_lock);
                         //raw_spin_unlock(&state->lock);
+                        local_irq_restore(flags);
                         mc2_update_timer_and_unlock(state);
                 }
                 this_cpu_inc(mode_counter);
-                local_irq_restore(flags);
+                //local_irq_restore(flags);
                 //cpu_0_spin_flag = !cpu_0_spin_flag;
         }
         else if (!mode_poll_exited) {
@@ -292,13 +293,13 @@ asmlinkage long sys_enact_mode(void)
                         //}
                 }
                 TRACE("CPU%d counter check. %d\n",state->cpu, this_cpu_read(mode_counter));
-                local_irq_save(flags);
+                //local_irq_save(flags);
                 if (mode_changed) {
                         lt_t new_mode_basetime = get_release(current);
                         //TRACE("CPU%d mode changed\n",state->cpu);
                         hrtimer_cancel(&state->timer); //stop listening to old mode timers
                         TRACE("Timer is cancelled at %llu. mode-change\n", litmus_clock());
-                        //local_irq_save(flags);
+                        local_irq_save(flags);
                         raw_spin_lock(&state->lock);
                         state->sup_env = &state->sup_env_modes[mode];
                         list_for_each(pos, &state->sup_env->active_reservations){
@@ -315,12 +316,11 @@ asmlinkage long sys_enact_mode(void)
                         }
                         sup_update_time(state->sup_env, litmus_clock());
                         //raw_spin_unlock(&state->lock);
+                        local_irq_restore(flags);
                         mc2_update_timer_and_unlock(state);
                         //local_irq_restore(flags);
         
                 }
-                //this_cpu_write(mode_counter, *cpu0_counter);
-                local_irq_restore(flags);
                 //state->spin_flag = !state->spin_flag;
         }
         else {
@@ -376,6 +376,7 @@ asmlinkage long sys_request_mode(int new_mode){
                 TRACE("Request to %d denied due to pending to %d\n", new_mode, requested_mode);
                 raw_spin_unlock(&mode_lock);
                 preempt_enable();
+                TRACE("MCR rejected because the previous MCR is pedning.\n");
                 return -EAGAIN;
         }
         if (mode == new_mode){
@@ -545,7 +546,7 @@ static int get_lowest_prio_cpu(lt_t priority)
 
         ce = &_lowest_prio_cpu.cpu_entries[local_cpu_state()->cpu];
         if (!ce->will_schedule && !ce->scheduled) {
-                TRACE("CPU %d (local) is the lowest!\n", ce->cpu);
+                TRACE("CPU %d (local) is the lowest (Idle)!\n", ce->cpu);
                 return ce->cpu;
         } else {
                 TRACE("Local CPU will_schedule=%d, scheduled=(%s/%d)\n", ce->will_schedule, ce->scheduled ? (ce->scheduled)->comm : "null", ce->scheduled ? (ce->scheduled)->pid : 0);
@@ -555,14 +556,16 @@ static int get_lowest_prio_cpu(lt_t priority)
                 ce = &_lowest_prio_cpu.cpu_entries[cpu];
                 /* If a CPU will call schedule() in the near future, we don't
                    return that CPU. */
+/*              
                 TRACE("CPU %d will_schedule=%d, scheduled=(%s/%d:%d)\n", cpu, ce->will_schedule,
               ce->scheduled ? (ce->scheduled)->comm : "null",
               ce->scheduled ? (ce->scheduled)->pid : 0,
               ce->scheduled ? (ce->scheduled)->rt_param.job_params.job_no : 0);
+*/
                 if (!ce->will_schedule) {
                         if (!ce->scheduled) {
                                 /* Idle cpu, return this. */
-                                TRACE("CPU %d is the lowest!\n", ce->cpu);
+                                TRACE("CPU %d is the lowest (Idle)!\n", ce->cpu);
                                 return ce->cpu;
                         } else if (ce->lv == CRIT_LEVEL_C && 
                                    ce->deadline > latest_deadline) {
@@ -572,10 +575,12 @@ static int get_lowest_prio_cpu(lt_t priority)
                 }
         }               
         
-        if (priority >= latest_deadline)
-                ret = NO_CPU;
+        TRACE("CPU %d is the lowest! deadline = %llu, my priority = %llu\n", ret, latest_deadline, priority);
         
-        TRACE("CPU %d is the lowest!\n", ret);
+        if (priority >= latest_deadline) {
+                TRACE("CPU %d is running a higher-priority task. return NO_CPU\n", ret);
+                ret = NO_CPU;
+        }       
 
         return ret;
 }
@@ -630,9 +635,10 @@ static void mc2_update_timer_and_unlock(struct mc2_cpu_state *state)
                                         //raw_spin_lock(&_lowest_prio_cpu.lock);
                                         _lowest_prio_cpu.cpu_entries[cpu].will_schedule = true;
                                         //raw_spin_unlock(&_lowest_prio_cpu.lock);
-                                        if (cpu == local_cpu_state()->cpu)
-                                                litmus_reschedule_local();
-                                        else
+                                        
+                                        //if (cpu == local_cpu_state()->cpu)
+                                        //      litmus_reschedule_local();
+                                        //else
                                                 reschedule[cpu] = 1;
                                 }
                         }
@@ -808,7 +814,7 @@ static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer)
                         //raw_spin_unlock(&_lowest_prio_cpu.lock);
                         TRACE("LOWEST CPU = P%d\n", cpu);
                         if (cpu == state->cpu && update > now)
-                                litmus_reschedule_local();
+                                ;//litmus_reschedule_local();
                         else
                                 reschedule[cpu] = 1;
                 }
@@ -839,6 +845,8 @@ static enum hrtimer_restart on_scheduling_timer(struct hrtimer *timer)
         return restart;
 }
 
+#define INIT_PHASE_LENGTH_NS    (1000000000)
+
 /* mc2_complete_job - syscall backend for job completions
  */
 static long mc2_complete_job(void)
@@ -846,14 +854,17 @@ static long mc2_complete_job(void)
         ktime_t next_release;
         long err;
         
-        enum crit_level lv;
+        enum crit_level lv = get_task_crit_level(current);
         
         raw_spin_lock(&mode_lock);
         tsk_rt(current)->completed = 1;
         raw_spin_unlock(&mode_lock);
-
-        lv = get_task_crit_level(current);
-
+        
+        if (atomic_read(&num_sync_released) == 0 && mode != 0) {
+                        tsk_rt(current)->sporadic_release = 0;
+                        TRACE_CUR("num_sync_released is 0\n");
+        }
+        
         /* If this the first job instance, we need to reset replenish
            time to the next release time */
         if (tsk_rt(current)->sporadic_release) {
@@ -872,7 +883,7 @@ static long mc2_complete_job(void)
                         raw_spin_lock(&state->lock);
                         for (i = 0; i<NR_MODES; i++) {
                                 if (in_mode(current,i) || i == 0) {
-                                        state->sup_env_modes[i].env.time_zero = tsk_rt(current)->sporadic_release_time;
+                                        state->sup_env_modes[i].env.time_zero = tsk_rt(current)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(current)->job_params.job_no);
                                 }
                         }
                         res = sup_find_by_id(state->sup_env, tinfo->mc2_param.res_id);
@@ -886,7 +897,7 @@ static long mc2_complete_job(void)
                         raw_spin_lock(&global_lock);
                         for (i = 0; i < NR_MODES; i++) {
                                 if (in_mode(current,i) || i == 0) {
-                                        _global_env_modes[i].env.time_zero = tsk_rt(current)->sporadic_release_time;
+                                        _global_env_modes[i].env.time_zero = tsk_rt(current)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(current)->job_params.job_no);
                                 }
                         }
                         res = gmp_find_by_id(_global_env, tinfo->mc2_param.res_id);
@@ -896,7 +907,7 @@ static long mc2_complete_job(void)
 
                 /* set next_replenish to synchronous release time */
                 BUG_ON(!res);
-                res->next_replenishment = tsk_rt(current)->sporadic_release_time;
+                res->next_replenishment = tsk_rt(current)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(current)->job_params.job_no);
 /*              
                 if (get_task_crit_level(current) == CRIT_LEVEL_A) {
                         struct table_driven_reservation *tdres;
@@ -909,9 +920,8 @@ static long mc2_complete_job(void)
                 res->cur_budget = 0;
                 res->env->change_state(res->env, res, RESERVATION_DEPLETED);
                 
-        //      TRACE_CUR("CHANGE NEXT_REP = %llu NEXT_UPDATE = %llu\n", res->next_replenishment, state->sup_env->next_scheduler_update);
+                TRACE_CUR("CHANGE NEXT_REP = %llu NEXT_UPDATE = %llu\n", res->next_replenishment, state->sup_env->next_scheduler_update);
                 if (lv == CRIT_LEVEL_C){
-                        //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
                         raw_spin_unlock(&global_lock);
                 }
                 raw_spin_unlock(&state->lock);
@@ -939,12 +949,12 @@ static long mc2_complete_job(void)
                 res = gmp_find_by_id(_global_env, tsk_mc2_data(current)->res_id);
                 if (res && !res->reported){
                         res_reported--;
-                        TRACE_CUR("RES_REPORTED = %d\n",res_reported);
+                        TRACE_CUR("RES_REPORTED = %d\n", res_reported);
                         res->reported = 1;
                         //Current task doesn't exist in new mode
-                        if ( !in_mode(current, requested_mode) ){
-                                litmus_reschedule_local();
-                        }
+                        //if ( !in_mode(current, requested_mode) ){
+                        //      litmus_reschedule_local();
+                        //}
                 }
                 raw_spin_unlock(&mode_lock);
         }
@@ -984,8 +994,10 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
 
 
         list_for_each_entry_safe(res, next, &sup_env->active_reservations, list) {
-                if (res->state == RESERVATION_ACTIVE) 
-                        TRACE_TASK(tsk, "ACT_LIST R%d cur.mode = %d, res->mode = %d budget = %llu\n", res->id, mode, res->mode, res->cur_budget);
+                if (res->state == RESERVATION_ACTIVE) {
+                        struct task_struct *t = res->ops->dispatch_client(res, &time_slice);
+                        TRACE_TASK(tsk, "CPU%d ACT_LIST R%d cur.mode = %d, res->mode = %d budget = %llu next_repl. = %llu, deadline = %llu\n", state->cpu, res->id, mode, res->mode, res->cur_budget, res->next_replenishment, get_deadline(t));
+                }
         }
                 
         list_for_each_entry_safe(res, next, &sup_env->active_reservations, list) {
@@ -998,9 +1010,7 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
                                         return tsk;
                                 } else {
                                         //if (!is_init_finished(tsk)) {
-                                        TRACE_TASK(tsk, "num_sync_released = %d, mode = %d\n", num_sync_released, mode);
-                                        if (mode != res->mode)
-                                                TRACE_CUR("Mode does nto match res mode %d\n", res->mode);
+//                                      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);
@@ -1031,6 +1041,13 @@ struct task_struct* mc2_global_dispatch(struct mc2_cpu_state* state)
         enum crit_level lv;
         lt_t time_slice;
         
+        list_for_each_entry_safe(res, next, &_global_env->active_reservations, list) {
+                if (res->state == RESERVATION_ACTIVE) {
+                        struct task_struct *t = res->ops->dispatch_client(res, &time_slice);
+                        TRACE_TASK(tsk, "GLOBAL ACT_LIST R%d cur.mode = %d, res->mode = %d budget = %llu next_repl. = %llu, deadline = %llu\n", res->id, mode, res->mode, res->cur_budget, res->next_replenishment, get_deadline(t));
+                }
+        }
+        
         raw_spin_lock(&mode_lock);
         list_for_each_entry_safe(res, next, &_global_env->active_reservations, list) {
                 BUG_ON(!res);
@@ -1176,10 +1193,15 @@ static struct task_struct* mc2_schedule(struct task_struct * prev)
                 if (is_realtime(prev))
                         gmp_update_time(_global_env, now);
                 state->scheduled = mc2_global_dispatch(state);
-                //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
+                _lowest_prio_cpu.cpu_entries[state->cpu].will_schedule = false;
+                update_cpu_prio(state);
+                raw_spin_unlock(&global_lock);
+        } else {
+                raw_spin_lock(&global_lock);
+                _lowest_prio_cpu.cpu_entries[state->cpu].will_schedule = false;
+                update_cpu_prio(state);
                 raw_spin_unlock(&global_lock);
         }
-        
         /*
         if (!state->scheduled) {
                 TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");raw_spin_lock(&global_lock);
@@ -1251,14 +1273,13 @@ static struct task_struct* mc2_schedule(struct task_struct * prev)
         }
 */
         post_schedule(state->scheduled, state->cpu);
-
-        //TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");
+/*
         raw_spin_lock(&global_lock);
         _lowest_prio_cpu.cpu_entries[state->cpu].will_schedule = false;
         update_cpu_prio(state);
         //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
         raw_spin_unlock(&global_lock);
-        
+*/      
         raw_spin_unlock(&state->lock);
         if (state->scheduled) {
                 TRACE_TASK(state->scheduled, "scheduled.\n");
@@ -1296,7 +1317,6 @@ static void mc2_task_resume(struct task_struct  *tsk)
         TRACE_TASK(tsk, "thread wakes up at %llu\n", litmus_clock());
 
         //local_irq_save(flags);
-        TRACE_TASK(tsk, "preemptible?? %d\n", preemptible());
         preempt_disable();
         tinfo = get_mc2_state(tsk);
         if (tinfo->cpu != -1)
@@ -1311,7 +1331,8 @@ static void mc2_task_resume(struct task_struct  *tsk)
         /* Requeue only if self-suspension was already processed. */
         if (tinfo->has_departed)
         {
-
+                raw_spin_lock(&state->lock);
+                local_irq_save(flags);
                 /* We don't want to consider jobs before synchronous releases */
                 if (tsk_rt(tsk)->job_params.job_no == 2) {
 /*
@@ -1331,16 +1352,19 @@ static void mc2_task_resume(struct task_struct  *tsk)
 */
                         TRACE_TASK(tsk, "INIT_FINISHED is SET\n");
                         tsk_mc2_data(tsk)->init_finished = 1;
-                        //TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");
-                        raw_spin_lock(&global_lock);
-                        num_sync_released--;
-                        //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
-                        raw_spin_unlock(&global_lock);
-                        TRACE_TASK(tsk, "INIT_FINISHED is SET, num_sync_released decreased to %d\n", num_sync_released);                        
+                        atomic_dec(&num_sync_released);
+                        //raw_spin_unlock(&global_lock);
+                        if (atomic_read(&num_sync_released) == 0) {
+                                lt_t start = tsk_rt(tsk)->sporadic_release_time + INIT_PHASE_LENGTH_NS*(tsk_rt(tsk)->job_params.job_no);
+                                TRACE("INIT_PHASE FINISHED. CHANGE TO MODE 1\n");
+                                sys_request_mode(1);
+                                sched_trace_sys_start(&start);
+                        }
+                        TRACE_TASK(tsk, "INIT_FINISHED is SET, num_sync_released decreased to %d\n", atomic_read(&num_sync_released));                  
                 }
 
-                raw_spin_lock(&state->lock);
-                local_irq_save(flags);
+//              raw_spin_lock(&state->lock);
+//              local_irq_save(flags);
                 /* Assumption: litmus_clock() is synchronized across cores,
                  * since we might not actually be executing on tinfo->cpu
                  * at the moment. */
@@ -1459,11 +1483,7 @@ static long mc2_admit_task(struct task_struct *tsk)
                 if (is_mode_poll_task(tsk) && tinfo->cpu == 0) {
                         cpu_0_task_exist = true;
                 }
-                //TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");
-                raw_spin_lock(&global_lock);
-                num_sync_released++;
-                //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
-                raw_spin_unlock(&global_lock);
+                atomic_inc(&num_sync_released);
                 local_irq_restore(flags);
                 raw_spin_unlock(&state->lock);
                 //raw_spin_unlock_irqrestore(&state->lock, flags);
@@ -1533,8 +1553,7 @@ static long mc2_admit_task(struct task_struct *tsk)
                         raw_spin_unlock(&mode_lock);
 
                 }
-                num_sync_released++;
-                //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
+                atomic_inc(&num_sync_released);
                 raw_spin_unlock(&global_lock);
                 //raw_spin_unlock_irqrestore(&state->lock, flags);      
                 local_irq_restore(flags);
@@ -1838,11 +1857,8 @@ static void mc2_task_exit(struct task_struct *tsk)
                 /* NOTE: drops state->lock */
                 TRACE("mc2_exit()\n");
 
-                //TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");
-                raw_spin_lock(&global_lock);
-                num_sync_released--;
-                //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
-                raw_spin_unlock(&global_lock);
+                atomic_dec(&num_sync_released);
+
                 mc2_update_timer_and_unlock(state);     
         } else {
                 raw_spin_unlock(&state->lock);
@@ -1850,17 +1866,16 @@ static void mc2_task_exit(struct task_struct *tsk)
         }
 
         if (lv == CRIT_LEVEL_C) {
-                //TRACE_CUR("LOCK_MSG: GLOBAL LOCK\n");
-                raw_spin_lock(&global_lock);
+                //raw_spin_lock(&global_lock);
                 raw_spin_lock(&mode_lock);
-                for(i = 0; i < NR_MODES; i++){
+                for(i = 1; i < NR_MODES; i++){
                         if ( !(tsk_mc2_data(tsk)->mode_mask & (1<<i)) )
                                 continue;
                         mode_sizes[i]--;
                 }
+                mode_sizes[0]--;
                 raw_spin_unlock(&mode_lock);
-                //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
-                raw_spin_unlock(&global_lock);
+                //raw_spin_unlock(&global_lock);
 
                 for_each_online_cpu(cpu) {
                         state = cpu_state_for(cpu);
@@ -2460,9 +2475,9 @@ static long mc2_deactivate_plugin(void)
                 }
         
         }
-        num_sync_released = 0;
-        //TRACE_CUR("LOCK_MSG: GLOBAL UNLOCK\n");
         raw_spin_unlock(&global_lock);
+        
+        atomic_set(&num_sync_released, 0);
         destroy_domain_proc_info(&mc2_domain_proc_info);
         return 0;
 }