Change ordering of fraction array and add first_cpu back

2 files changed, 14 insertions, 12 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 74210f3b362e..d250e538a63e 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -62,6 +62,8 @@ struct edffm_params {
 };
 
 struct edfos_params {
+        /* The first CPU.*/
+        unsigned int first_cpu;
         /* Whether this task is a migrating task*/
         unsigned int migrat;
         /* Time of next subtask release or deadline */
@@ -72,7 +74,7 @@ struct edfos_params {
          * The first column is the numerator of the fraction.
          * The second column is the denominator.
          */
-        lt_t            fraction[2][NR_CPUS];
+        lt_t            fraction[NR_CPUS][2];
         struct bheap release_queue;
         struct bheap ready_queue;
 };
diff --git a/litmus/sched_edf_os.c b/litmus/sched_edf_os.c
index 1c633b591412..ba049adc8154 100644
--- a/litmus/sched_edf_os.c
+++ b/litmus/sched_edf_os.c
@@ -40,8 +40,8 @@ DEFINE_PER_CPU(edfos_domain_t, edfos_domains);
 #define wrong_cpu(t)            is_migrat_task((t)) \
                                 && task_cpu((t)) != get_partition((t))
 /* Manipulate share for current cpu */
-#define cur_cpu_fract_num(t)    edfos_params(t).fraction[0][get_partition(t)]
-#define cur_cpu_fract_den(t)    edfos_params(t).fraction[1][get_partition(t)]
+#define cur_cpu_fract_num(t)    edfos_params(t).fraction[get_partition(t)][0]
+#define cur_cpu_fract_den(t)    edfos_params(t).fraction[get_partition(t)][1]
 /* Get job number for current cpu */
 #define cur_cpu_job_no(t)       \
         tsk_rt(t)->semi_part.cpu_job_no[get_partition(t)]
@@ -293,8 +293,8 @@ static int next_cpu_for_job(struct task_struct *t)
                                   &edfos_params(t).release_queue);
                 cpu = ((int*)node->value) - edfos_params(t).heap_data;
                 *((int*)node->value) = compute_pfair_deadline(
-                                edfos_params(t).fraction[0][cpu],
-                                edfos_params(t).fraction[1][cpu],
+                                edfos_params(t).fraction[cpu][0],
+                                edfos_params(t).fraction[cpu][1],
                                 tsk_rt(t)->semi_part.cpu_job_no[cpu] + 1);
                 bheap_insert(fakepfair_ready_order,
                              &edfos_params(t).ready_queue, node);
@@ -307,16 +307,16 @@ static int next_cpu_for_job(struct task_struct *t)
                           &edfos_params(t).ready_queue);
         cpu = ((int*)node->value) - edfos_params(t).heap_data;
 
-        next_rel = compute_pfair_release(edfos_params(t).fraction[0][cpu],
-                                         edfos_params(t).fraction[1][cpu],
+        next_rel = compute_pfair_release(edfos_params(t).fraction[cpu][0],
+                                         edfos_params(t).fraction[cpu][1],
                                          tsk_rt(t)->semi_part.cpu_job_no[cpu]
                                          + 1);
         if (next_rel <= tsk_rt(t)->job_params.job_no)
         {
                 /* Next subtask already released. */
                 (*(int*)node->value) = compute_pfair_deadline(
-                                        edfos_params(t).fraction[0][cpu],
-                                        edfos_params(t).fraction[1][cpu],
+                                        edfos_params(t).fraction[cpu][0],
+                                        edfos_params(t).fraction[cpu][1],
                                         tsk_rt(t)->semi_part.cpu_job_no[cpu] +
                                         1);
                 bheap_insert(fakepfair_ready_order,
@@ -485,11 +485,11 @@ static void edfos_task_new(struct task_struct * t, int on_rq, int running)
         
         for (i = 0; i < NR_CPUS; i++)
         {
-                if (edfos_params(t).fraction[0][i] > 0)
+                if (edfos_params(t).fraction[i][0] > 0)
                 {
                         edfos_params(t).heap_data[i] = compute_pfair_deadline(
-                                        edfos_params(t).fraction[0][i],
-                                        edfos_params(t).fraction[1][i], 0);
+                                        edfos_params(t).fraction[i][0],
+                                        edfos_params(t).fraction[i][1], 0);
                         bheap_add(fakepfair_ready_order,
                                   &edfos_params(t).ready_queue,
                                   &edfos_params(t).heap_data[i], GFP_ATOMIC);