4/14/2017 end of the day

1 files changed, 22 insertions, 12 deletions

diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index ced00ed2ba37..16c5c4af0e13 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -116,6 +116,9 @@ bool cpu_0_spin_flag;
 bool seen_once;
 bool cpu_0_task_exist;
 bool mode_changed;
+static DEFINE_PER_CPU(unsigned long, mode_counter);
+#define local_mode_counter()    (this_cpu_ptr(&mode_counter))
+#define cpu_0_mode_counter()    (&per_cpu(mode_counter, 0))
 #define in_mode(t, modenum)     (tsk_mc2_data(t)->mode_mask & (1 << modenum))
 #define pending                 mode != requested_mode
 #define ready                   !res_reported
@@ -228,25 +231,29 @@ asmlinkage long sys_enact_mode(void)
                         //raw_spin_unlock(&state->lock);
                         //mc2_update_timer_and_unlock(state);
                 }
+                this_cpu_inc(mode_counter);
                 local_irq_restore(flags);
-                cpu_0_spin_flag = !cpu_0_spin_flag;
+                //cpu_0_spin_flag = !cpu_0_spin_flag;
         }
         else if (cpu_0_task_exist) {
                 //spin, wait for CPU 0 to stabilize mode decision
                 //before scheduling next hyperperiod
                 //TRACE("CPU%d start spinning. %d\n",state->cpu, mode_changed);
+                unsigned long *cpu0_counter = cpu_0_mode_counter();
+/*
                 if (state->spin_flag) {
-                        //TRACE_CUR("state->spin_flag %d\n",state->spin_flag);
                         while(cpu_0_spin_flag)
-                                udelay(1); //TRACE_CUR("state->spin_flag %d cpu_0_spin_flag %d\n",state->spin_flag, cpu_0_spin_flag);
+                                udelay(1);
                 }
                 else {
-                        //TRACE_CUR("state->spin_flag %d\n",state->spin_flag);
                         while(!cpu_0_spin_flag)
-                                //TRACE_CUR("state->spin_flag %d cpu_0_spin_flag %d\n",state->spin_flag, cpu_0_spin_flag);
                                 udelay(1);
                 }
-                TRACE("CPU%d flag check. %d\n",state->cpu, mode_changed);
+                */
+                //TRACE("CPU%d flag check. %d\n",state->cpu, mode_changed);
+                while (*cpu0_counter == this_cpu_read(mode_counter))
+                        udelay(1);
+                TRACE("CPU%d counter check. %d\n",state->cpu, this_cpu_read(mode_counter));
                 local_irq_save(flags);
                 if (mode_changed) {
                         lt_t new_mode_basetime = get_release(current);
@@ -277,8 +284,9 @@ asmlinkage long sys_enact_mode(void)
         
                         //preempt_enable();
                 }
+                this_cpu_write(mode_counter, *cpu0_counter);
                 local_irq_restore(flags);
-                state->spin_flag = !state->spin_flag;
+                //state->spin_flag = !state->spin_flag;
         }
         else {
                 //TRACE("CPU%d no cpu_0_task_exist.%d\n",state->cpu, mode_changed);
@@ -908,12 +916,12 @@ struct task_struct* mc2_dispatch(struct sup_reservation_environment* sup_env, st
         enum crit_level lv;
         lt_t time_slice;
 
-/*
+
         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);
         }
-*/              
+                
         list_for_each_entry_safe(res, next, &sup_env->active_reservations, list) {
                 if (res->state == RESERVATION_ACTIVE) {
                         tsk = res->ops->dispatch_client(res, &time_slice);
@@ -924,7 +932,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);
+                                        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);
@@ -1263,12 +1271,12 @@ static void mc2_task_resume(struct task_struct  *tsk)
                                         break;
                         }
 */
-                        TRACE_CUR("INIT_FINISHED is SET\n");
+                        TRACE_TASK(tsk, "INIT_FINISHED is SET\n");
                         tsk_mc2_data(tsk)->init_finished = 1;
                         raw_spin_lock(&global_lock);
                         num_sync_released--;
                         raw_spin_unlock(&global_lock);
-                        TRACE_CUR("INIT_FINISHED is SET, num_sync_released decreased to %d\n", num_sync_released);                      
+                        TRACE_TASK(tsk, "INIT_FINISHED is SET, num_sync_released decreased to %d\n", num_sync_released);                        
                 }
 
                 raw_spin_lock(&state->lock);
@@ -2212,6 +2220,8 @@ static long mc2_activate_plugin(void)
 
                 resched_cpu[cpu] = 0;
                 //level_a_priorities[cpu] = 0;
+                this_cpu_write(mode_counter, 0);
+                
                 state = cpu_state_for(cpu);
                 ce = &_lowest_prio_cpu.cpu_entries[cpu];