beautify P-EDF code

- make local and remote cpu state and edf domain references explicit

1 files changed, 16 insertions, 17 deletions

diff --git a/kernel/sched_part_edf.c b/kernel/sched_part_edf.c
index 46a999e122..792e022833 100644
--- a/kernel/sched_part_edf.c
+++ b/kernel/sched_part_edf.c
@@ -22,6 +22,12 @@ typedef struct {
 } part_edf_domain_t;
 
 
+#define local_edf               (&__get_cpu_var(part_edf_domains).domain)
+#define local_pedf              (&__get_cpu_var(part_edf_domains))
+#define remote_edf(cpu)         (&per_cpu(part_edf_domains, cpu).domain)
+#define remote_pedf(cpu)        (&per_cpu(part_edf_domains, cpu))
+
+
 static void part_edf_domain_init(part_edf_domain_t* pedf, 
                                  edf_check_resched_needed_t check,
                                  int cpu)
@@ -65,7 +71,7 @@ static reschedule_check_t part_edf_scheduler_tick(void)
         unsigned long flags;
         struct task_struct *t = current;
         reschedule_check_t want_resched = NO_RESCHED;
-        edf_domain_t *edf = &__get_cpu_var(part_edf_domains).domain;
+        edf_domain_t *edf = local_edf;
 
         /* expire tasks even if not in real-time mode
          * this makes sure that at the end of real-time mode
@@ -105,7 +111,7 @@ static int part_edf_schedule(struct task_struct * prev,
 {
         int                     need_deactivate = 1;
         unsigned long           flags;
-        part_edf_domain_t*      pedf = &__get_cpu_var(part_edf_domains);
+        part_edf_domain_t*      pedf = local_pedf;
         edf_domain_t*           edf  = &pedf->domain; 
 
 
@@ -152,7 +158,7 @@ static int part_edf_schedule(struct task_struct * prev,
 
 static void part_edf_finish_switch(struct task_struct *prev) 
 {
-        edf_domain_t*   edf = &__get_cpu_var(part_edf_domains).domain;
+        edf_domain_t*   edf = local_edf;
 
         if (!is_realtime(prev) || !is_running(prev))
                 return;
@@ -188,12 +194,11 @@ static void part_edf_finish_switch(struct task_struct *prev)
  */
 static long part_edf_prepare_task(struct task_struct * t)
 {
-        int             target_cpu = get_partition(t);
-        edf_domain_t*   edf = &per_cpu(part_edf_domains, target_cpu).domain;
+        edf_domain_t*   edf = remote_edf(get_partition(t));
 
 
         printk(KERN_WARNING "[%d] part edf: prepare task %d on CPU %d\n", 
-                smp_processor_id(), t->pid, target_cpu);
+                smp_processor_id(), t->pid, get_partition(t));
         if (t->state == TASK_STOPPED) {
                 __setscheduler(t, SCHED_FIFO, MAX_RT_PRIO - 1);
 
@@ -216,7 +221,7 @@ static void part_edf_wake_up_task(struct task_struct *task)
 {
         edf_domain_t* edf;
 
-        edf = &per_cpu(part_edf_domains, get_partition(task)).domain;
+        edf = remote_edf(get_partition(task));
 
         /* We must determine whether task should go into the release       
          * queue or into the ready queue. It may enter the ready queue 
@@ -283,16 +288,10 @@ static long part_edf_tear_down(struct task_struct * t)
 static int part_edf_mode_change(int new_mode)
 {
         int                     cpu;
-        edf_domain_t*           edf;
-
 
-        if (new_mode == MODE_RT_RUN) {
-                for_each_online_cpu(cpu) {
-                        edf = &per_cpu(part_edf_domains, cpu).domain;
-                        prepare_new_releases(edf, jiffies);
-                }               
-
-        }
+        if (new_mode == MODE_RT_RUN)
+                for_each_online_cpu(cpu)
+                        prepare_new_releases(remote_edf(cpu), jiffies);
         TRACE("[%d] part edf: mode changed to %d\n", 
                smp_processor_id(), new_mode);
         return 0;
@@ -334,7 +333,7 @@ sched_plugin_t *__init init_part_edf_plugin(void)
                 set_sched_options(SCHED_NONE);
                 for (i = 0; i < NR_CPUS; i++)
                 {
-                        part_edf_domain_init(&per_cpu(part_edf_domains, i), 
+                        part_edf_domain_init(remote_pedf(i), 
                                              part_edf_check_resched, i);
                         printk("CPU partition %d initialized.", i);
                 }