Merge branch 'wip-modechange' of ssh://rtsrv.cs.unc.edu/home/litmus/litmus-rt into wip-modechange

1 files changed, 53 insertions, 21 deletions

diff --git a/litmus/sched_mc2.c b/litmus/sched_mc2.c
index ee04315c44a0..525af34f0875 100644
--- a/litmus/sched_mc2.c
+++ b/litmus/sched_mc2.c
@@ -117,7 +117,7 @@ bool cpu_0_spin_flag;
  * A and B hyperperiod
  */
 
-asmlinkage int sys_enact_mode(void)
+asmlinkage long sys_enact_mode(void)
 {
         struct mc2_cpu_state *state = local_cpu_state();
         struct list_head *pos;
@@ -128,25 +128,53 @@ asmlinkage int sys_enact_mode(void)
                 raw_spin_lock(&global_lock);
                 raw_spin_lock(&mode_lock); 
                 if (mode != requested_mode //MCR has entered 
-                        && !res_reported){ //and C is throttled
-                        mode = requested_mode;
-                        _global_env = &_global_env_modes[mode];
-                        //set res->reported for new global tasks
-                        list_for_each(pos, &_global_env->active_reservations){
-                                res = list_entry(pos, struct reservation, list);
-                                
-                                res->reported = 0;
-                        }
-                        list_for_each(pos, &_global_env->depleted_reservations){
-                                res = list_entry(pos, struct reservation, list);
-                                res->reported = 0;
+                        if( !res_reported){ //and C is throttled
+                                mode = requested_mode;
+                                _global_env = &_global_env_modes[mode];
+                                //set res->reported for new global tasks
+                                list_for_each(pos, &_global_env->active_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        res->reported = 0;
+                                }
+                                list_for_each(pos, &_global_env->depleted_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        res->reported = 0;
+                                }
+                                list_for_each(pos, &_global_env->inactive_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        res->reported = 0;
+                                        res->env->change_state(res->env, res, RESERVATION_ACTIVE);
+                                }
+                                //gmp_update_time(_global_env, now);
                         }
-                        list_for_each(pos, &_global_env->inactive_reservations){
-                                res = list_entry(pos, struct reservation, list);
-                                res->reported = 0;
-                                res->env->change_state(res->env, res, RESERVATION_ACTIVE);
+                        else{
+                                list_for_each(pos, &_global_env->active_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        if (tsk_rt(res->tsk)->completed){
+                                                res->env->change_state(res->env, res, RESERVATION_INACTIVE);
+                                                res->reported = 1;
+                                                res_reported--;
+                                        }
+                                }
+                                list_for_each(pos, &_global_env->depleted_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        if (tsk_rt(res->tsk)->completed){
+                                                res->env->change_state(res->env, res, RESERVATION_INACTIVE);
+                                                res->reported = 1;
+                                                res_reported--;
+                                        }
+
+                                }
+                                list_for_each(pos, &_global_env->inactive_reservations){
+                                        res = list_entry(pos, struct reservation, list);
+                                        if (tsk_rt(res->tsk)->completed){
+                                                res->env->change_state(res->env, res, RESERVATION_INACTIVE);
+                                                res->reported = 1;
+                                                res_reported--;
+                                        }
+                                }
                         }
-                        //gmp_update_time(_global_env, now);            
+                
                 }
                 raw_spin_unlock(&mode_lock);
                 raw_spin_unlock(&global_lock);
@@ -173,7 +201,7 @@ asmlinkage int sys_enact_mode(void)
  * Called from non-real time program
  * Protect by exclusive lock to prevent from occuring while mode change is enacted
  */
-asmlinkage int sys_request_mode(int new_mode){
+asmlinkage long sys_request_mode(int new_mode){
         raw_spin_lock(&mode_lock);
         if (mode != requested_mode){
                 raw_spin_unlock(&mode_lock);
@@ -617,9 +645,11 @@ static long mc2_complete_job(void)
         long err;
 
         enum crit_level lv;
-
-        tsk_rt(current)->completed = 1;
         
+        raw_spin_lock(&mode_lock);
+        tsk_rt(current)->completed = 1;
+        raw_spin_unlock(&mode_lock);
+
         lv = get_task_crit_level(current);
 
         /* If this the first job instance, we need to reset replenish
@@ -734,7 +764,9 @@ static long mc2_complete_job(void)
 
         TRACE_CUR("mc2_complete_job returns at %llu\n", litmus_clock());
 
+        raw_spin_lock(&mode_lock);
         tsk_rt(current)->completed = 0;
+        raw_spin_unlock(&mode_lock);
         return err;
 }