Merge branch 'EXT-RES' into omlp

Merge in change to reservation priority to avoid swapping order
of calls to higher_res_prio.

1 files changed, 5 insertions, 7 deletions

diff --git a/litmus/reservations/gedf_reservation.c b/litmus/reservations/gedf_reservation.c
index e16be7de4902..82b3933d790a 100644
--- a/litmus/reservations/gedf_reservation.c
+++ b/litmus/reservations/gedf_reservation.c
@@ -24,7 +24,7 @@ struct csd_wrapper {
 /* returns 1 if res of a has earlier deadline than res of b */
 static int edf_ready_order(struct bheap_node* a, struct bheap_node* b)
 {
-        return higher_res_prio(bheap2res(b), bheap2res(a));
+        return higher_res_prio(bheap2res(a), bheap2res(b));
 }
 
 /* Functions used to maintain a heap of cpu entries in edf order
@@ -39,7 +39,6 @@ static int cpu_lower_prio(struct bheap_node *_a, struct bheap_node *_b)
         struct gedf_cpu_entry *a, *b;
         a = _a->value;
         b = _b->value;
-        /* use higher prio here because prio is deadline value */
         return higher_res_prio(&b->linked->res, &a->linked->res);
 }
 
@@ -73,8 +72,7 @@ static int edf_preemption_needed(
          *       don't know what address space we're currently in.
          */
 
-        /* reversed */
-        return higher_res_prio(&gedf_res->res, __next_ready_res(&gedf_env->domain));
+        return higher_res_prio(__next_ready_res(&gedf_env->domain), &gedf_res->res);
 }
 
 /* ******************************************************************************** */
@@ -222,7 +220,7 @@ static void gedf_replenish_budget(
         res->budget_consumed = 0;
         res->cur_budget = gedf_cont_res->max_budget;
         res->replenishment_time += gedf_cont_res->period;
-        res->priority = res->replenishment_time + gedf_cont_res->relative_deadline;
+        res->priority = ULLONG_MAX - res->replenishment_time - gedf_cont_res->relative_deadline;
 }
 
 static void gedf_task_replenish_budget(
@@ -236,12 +234,12 @@ static void gedf_task_replenish_budget(
                 prepare_for_next_period(t);
                 tsk_rt(t)->completed = 0;
                 sched_trace_task_release(t);
-                res->priority = get_deadline(t);
+                res->priority = ULLONG_MAX - get_deadline(t);
                 res->replenishment_time = get_release(t);
         } else {
                 sched_trace_task_completion(t, 1);
                 res->replenishment_time += get_rt_period(t);
-                res->priority = res->replenishment_time + get_rt_relative_deadline(t);
+                res->priority = ULLONG_MAX - res->replenishment_time - get_rt_relative_deadline(t);
                 TRACE_TASK(t, "overrun budget!\n");
         }
         res->budget_consumed = 0;