Undo WM damage to common files

4 files changed, 3 insertions, 95 deletions

diff --git a/include/litmus/jobs.h b/include/litmus/jobs.h
index cebe18d615da..9bd361ef3943 100644
--- a/include/litmus/jobs.h
+++ b/include/litmus/jobs.h
@@ -5,7 +5,5 @@ void prepare_for_next_period(struct task_struct *t);
 void release_at(struct task_struct *t, lt_t start);
 long complete_job(void);
 
-void prepare_next_slice(struct task_struct *t, int new_release);
-
 #endif
 
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 9731578e8b0e..674528eece14 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -80,35 +80,11 @@ void litmus_exit_task(struct task_struct *tsk);
 #define get_release(t)          (tsk_rt(t)->job_params.release)
 #define get_class(t)            (tsk_rt(t)->task_params.cls)
 
-
-/* Realtime utility macros for semi-partitioned algorithm - Migrating Task.
- * These macros provide per cpu accounting stats.
- * */
-
-#define get_cpu_period(t)       (tsk_rt(t)->task_params.periods[tsk_rt(t)->task_params.curr])
-#define get_cpu_exec_cost(t)    (tsk_rt(t)->task_params.wcets[tsk_rt(t)->task_params.curr])
-#define get_rt_cpu_phase(t,cpu)         (tsk_rt(t)->task_params.phases[cpu])
-#define get_cpu_partition(t)    (tsk_rt(t)->task_params.cpus[tsk_rt(t)->task_params.curr])
-#define get_cpu_exec_time(t)    (tsk_rt(t)->job_params.exec_time_curr_cpu)
-
 inline static int budget_exhausted(struct task_struct* t)
 {
         return get_exec_time(t) >= get_exec_cost(t);
 }
 
-
-/* Check whether the task has exhausted its budget on current cpu */
-
-inline static int cpu_budget_exhausted(struct task_struct* t,int flag)
-{
-        if(t->rt_param.task_params.count > 1 && flag){
-                return get_cpu_exec_time(t) >= get_cpu_exec_cost(t);
-        }
-        else{
-                return budget_exhausted(t);
-        }
-}
-
 #define budget_enforced(t) (tsk_rt(t)->task_params.budget_policy != NO_ENFORCEMENT)
 
 
diff --git a/litmus/jobs.c b/litmus/jobs.c
index 4eed6e04fe0e..36e314625d86 100644
--- a/litmus/jobs.c
+++ b/litmus/jobs.c
@@ -13,39 +13,17 @@ void prepare_for_next_period(struct task_struct *t)
         t->rt_param.job_params.release   = t->rt_param.job_params.deadline;
         t->rt_param.job_params.deadline += get_rt_period(t);
         t->rt_param.job_params.exec_time = 0;
-        t->rt_param.job_params.exec_time_curr_cpu = 0;
         /* update job sequence number */
         t->rt_param.job_params.job_no++;
-        t->rt_param.job_params.execs[0] = t->rt_param.task_params.exec_cost;
+
         /* don't confuse Linux */
         t->rt.time_slice = 1;
 }
 
-
-/*
- * Prepare a task for release on next CPU for a semi-partitioned algorithm.
- * This function prepares the next slice of a job or next job (if all slices are over) for release on next cpu.
- *
- */
-
 void release_at(struct task_struct *t, lt_t start)
 {
-        int i=0;
-        if(t->rt_param.task_params.count > 1){
-                /* Migratory task. Initialize deadline and call prepare_next_slice() */
-                for(i=0;i<t->rt_param.task_params.count;i++){
-                        t->rt_param.job_params.deadlines[i] = start;
-                }
-                prepare_next_slice(t,1);
-                TRACE_TASK(t,"Current CPU : %d, Execution Time on this cpu : %llu\n",t->rt_param.task_params.cpus[t->rt_param.task_params.curr],get_cpu_exec_cost(t));
-        }
-        else{
-                /* Fixed task. Handle it the normal way */
-                t->rt_param.job_params.deadline = start;
-                TRACE_TASK(t,"Current CPU : %d\n",t->rt_param.task_params.cpu);
-                prepare_for_next_period(t);
-                TRACE_TASK(t,"Current CPU : %d, Execution Time on this cpu : %llu\n",t->rt_param.task_params.cpu,get_exec_cost(t));
-        }
+        t->rt_param.job_params.deadline = start;
+        prepare_for_next_period(t);
         set_rt_flags(t, RT_F_RUNNING);
 }
 
@@ -63,45 +41,3 @@ long complete_job(void)
         schedule();
         return 0;
 }
-
-
-void prepare_next_slice(struct task_struct *t, int new_release)
-{
-        int i;
-        BUG_ON(!t);
-
-        if(t->rt_param.job_params.job_no == 0){
-                /* This is the first job of this task. Update all parameters such as release time, deadline for each slice. */
-                TRACE_TASK(t,"Setting for first time\n");
-                for(i=0;i<t->rt_param.task_params.count;i++){
-                        t->rt_param.job_params.releases[i] = t->rt_param.job_params.deadlines[i] + i * ( t->rt_param.task_params.period / t->rt_param.task_params.count);
-                        t->rt_param.job_params.deadlines[i] = t->rt_param.job_params.releases[i] + (t->rt_param.task_params.period / t->rt_param.task_params.count);
-                        t->rt_param.job_params.execs[i] = t->rt_param.task_params.wcets[i];
-                }
-                t->rt_param.job_params.job_no++;
-        }
-        else if(t->rt_param.task_params.curr == 0){
-                /* this is new job of this task. Update all parameters such as release time, deadline for each slice. */
-                for(i=0;i<t->rt_param.task_params.count;i++){
-                        if(!new_release){
-                                t->rt_param.job_params.releases[i] += t->rt_param.task_params.period;
-                        }
-                        else{
-                                t->rt_param.job_params.releases[i] = t->rt_param.job_params.deadlines[i] + i * ( t->rt_param.task_params.period / t->rt_param.task_params.count);
-                        }
-                        t->rt_param.job_params.deadlines[i] = t->rt_param.job_params.releases[i] + (t->rt_param.task_params.period / t->rt_param.task_params.count);
-                        t->rt_param.job_params.execs[i] = t->rt_param.task_params.wcets[i];
-                }
-                t->rt_param.job_params.job_no++;
-                t->rt_param.job_params.exec_time = 0;
-        }
-
-        /* Set the job's current release time and deadline to be the deadline of current slice. */
-        t->rt_param.task_params.cpu = t->rt_param.task_params.cpus[t->rt_param.task_params.curr];
-        t->rt_param.job_params.exec_time_curr_cpu = 0;
-        t->rt_param.job_params.release = t->rt_param.job_params.releases[t->rt_param.task_params.curr];
-        t->rt_param.job_params.deadline = t->rt_param.job_params.deadlines[t->rt_param.task_params.curr];
-
-        /* don't confuse Linux */
-        t->rt.time_slice = 1;
-}
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index 72858b84b7e7..c65388969789 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -10,8 +10,6 @@ static void update_time_litmus(struct rq *rq, struct task_struct *p)
                 delta = 0;
         /* per job counter */
         p->rt_param.job_params.exec_time += delta;
-        
-        p->rt_param.job_params.exec_time_curr_cpu += delta;
         /* task counter */
         p->se.sum_exec_runtime += delta;
         /* sched_clock() */