1 files changed, 17 insertions, 16 deletions

diff --git a/litmus/sched_gsn_edf_split.c b/litmus/sched_gsn_edf_split.c
index dac86900fd06..0fe324e2c156 100644
--- a/litmus/sched_gsn_edf_split.c
+++ b/litmus/sched_gsn_edf_split.c
@@ -16,7 +16,7 @@
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 #include <litmus/sched_plugin.h>
-#include <litmus/edf_common.h>
+#include <litmus/edf_split_common.h>
 #include <litmus/sched_trace.h>
 #include <litmus/trace.h>
 
@@ -65,7 +65,7 @@ inline static int get_slice_num(struct task_struct* t)
         }
 }
 
-/* Returns the appropriate deadline.*/
+/* Returns the appropriate subjob deadline.*/
 inline static lt_t get_proper_deadline(struct task_struct* t)
 {
         return t->rt_param.job_params.release +
@@ -76,8 +76,8 @@ inline static lt_t get_proper_deadline(struct task_struct* t)
 /* Tells us if the current deadline is too small.*/
 inline static int needs_deadline_move(struct task_struct* t)
 {
-        BUG_ON(get_proper_deadline(t) < t->rt_param.job_params.deadline);
-        return get_proper_deadline(t) != t->rt_param.job_params.deadline;
+        BUG_ON(get_proper_deadline(t) < t->rt_param.job_params.subjob_deadline);
+        return get_proper_deadline(t) != t->rt_param.job_params.subjob_deadline;
 }
 
 /*Returns execution time until the next deadline move.
@@ -172,7 +172,7 @@ static int cpu_lower_prio(struct bheap_node *_a, struct bheap_node *_b)
         /* Note that a and b are inverted: we want the lowest-priority CPU at
          * the top of the heap.
          */
-        return edf_higher_prio(b->linked, a->linked);
+        return edf_split_higher_prio(b->linked, a->linked);
 }
 
 /* update_cpu_position - Move the cpu entry to the correct place to maintain
@@ -324,7 +324,7 @@ static void check_for_preemptions(void)
         cpu_entry_t *last;
 
         for (last = lowest_prio_cpu();
-                edf_preemption_needed(&gsnedfsplit, last->linked);
+                edf_split_preemption_needed(&gsnedfsplit, last->linked);
                 last = lowest_prio_cpu()) {
                 /* preemption necessary */
                 task = __take_ready(&gsnedfsplit);
@@ -391,9 +391,10 @@ static noinline void job_completion(struct task_struct *t, int forced)
         t->rt_param.job_params.deadline = t->rt_param.job_params.release +
                 t->rt_param.task_params.period;
         prepare_for_next_period(t);
-        /* We now set the deadline to what it should be for scheduling priority.
+        /* We now set the subjob deadline to what it should be for scheduling
+         * priority.
          */
-        t->rt_param.job_params.deadline = get_proper_deadline(t);
+        t->rt_param.job_params.subjob_deadline = get_proper_deadline(t);
         if (is_released(t, litmus_clock()))
                 sched_trace_task_release(t);
         /* unlink */
@@ -413,7 +414,7 @@ static void move_deadline(struct task_struct *t)
         if (queue){
                 remove(&gsnedfsplit, t);
         }
-        t->rt_param.job_params.deadline = get_proper_deadline(t);
+        t->rt_param.job_params.subjob_deadline = get_proper_deadline(t);
         if (on_cpu != NO_CPU){
                 /*If previously scheduled, may need to schedule something
                   else.*/
@@ -623,7 +624,7 @@ static void gsnedfsplit_release_at(struct task_struct *t, lt_t start)
 {
         t->rt_param.job_params.deadline = start;
         prepare_for_next_period(t);
-        t->rt_param.job_params.deadline = get_proper_deadline(t);
+        t->rt_param.job_params.subjob_deadline = get_proper_deadline(t);
         set_rt_flags(t, RT_F_RUNNING);
 }
 
@@ -776,7 +777,7 @@ static void set_priority_inheritance(struct task_struct* t, struct task_struct*
                          * heap. Note that this could be a release heap if we
                          * budget enforcement is used and this job overran. */
                         check_preempt =
-                                !bheap_decrease(edf_ready_order,
+                                !bheap_decrease(edf_split_ready_order,
                                                 tsk_rt(t)->heap_node);
                 } else {
                         /* Nothing to do: if it is not queued and not linked
@@ -799,7 +800,7 @@ static void set_priority_inheritance(struct task_struct* t, struct task_struct*
                         /* heap_decrease() hit the top level of the heap: make
                          * sure preemption checks get the right task, not the
                          * potentially stale cache. */
-                        bheap_uncache_min(edf_ready_order,
+                        bheap_uncache_min(edf_split_ready_order,
                                           &gsnedfsplit.ready_queue);
                         check_for_preemptions();
                 }
@@ -862,7 +863,7 @@ static struct task_struct* find_hp_waiter(struct fmlp_semaphore *sem,
                                                            task_list)->private;
 
                 /* Compare task prios, find high prio task. */
-                if (queued != skip && edf_higher_prio(queued, found))
+                if (queued != skip && edf_split_higher_prio(queued, found))
                         found = queued;
         }
         return found;
@@ -891,9 +892,9 @@ int gsnedfsplit_fmlp_lock(struct litmus_lock* l)
                 __add_wait_queue_tail_exclusive(&sem->wait, &wait);
 
                 /* check if we need to activate priority inheritance */
-                if (edf_higher_prio(t, sem->hp_waiter)) {
+                if (edf_split_higher_prio(t, sem->hp_waiter)) {
                         sem->hp_waiter = t;
-                        if (edf_higher_prio(t, sem->owner))
+                        if (edf_split_higher_prio(t, sem->owner))
                                 set_priority_inheritance(sem->owner, sem->hp_waiter);
                 }
 
@@ -1123,7 +1124,7 @@ static int __init init_gsn_edf(void)
                 entry->split_timer.function = on_split_timeout;
                 bheap_node_init(&entry->hn, entry);
         }
-        edf_domain_init(&gsnedfsplit, NULL, gsnedfsplit_release_jobs);
+        edf_split_domain_init(&gsnedfsplit, NULL, gsnedfsplit_release_jobs);
         return register_sched_plugin(&gsn_edf_plugin);
 }