Checkpoint1(Updated)

Encounters problem where task waits an extra period due to
sleep(unresolved)

3 files changed, 26 insertions, 21 deletions

diff --git a/include/litmus/reservations/ext_reservation.h b/include/litmus/reservations/ext_reservation.h
index 7ec326bd14bd..68784f71a268 100644
--- a/include/litmus/reservations/ext_reservation.h
+++ b/include/litmus/reservations/ext_reservation.h
@@ -23,6 +23,12 @@ typedef void (*drain_budget_t) (
         int cpu
 );
 
+typedef struct task_struct* (*dispatch_client_t) (
+        struct reservation *reservation,
+        lt_t now,
+        int cpu
+);
+
 /* When reservation is scheduled. */
 typedef void (*on_schedule_t) (
         struct reservation *reservation,
@@ -42,6 +48,7 @@ typedef void (*shutdown_t)(struct reservation *reservation);
 struct reservation_ops {
         drain_budget_t drain_budget;
         replenish_budget_t replenish_budget;
+        dispatch_client_t dispatch_client;
         on_schedule_t on_schedule;
         on_preempt_t on_preempt;
         shutdown_t shutdown;
@@ -53,7 +60,7 @@ struct reservation {
         /* exact meaning defined by impl. */
         lt_t priority;
         lt_t cur_budget;
-        lt_t next_replenishment;
+        lt_t replenishment_time;
 
         /* budget stats */
         lt_t budget_consumed; /* how much budget consumed in this allocation cycle? */
diff --git a/include/litmus/reservations/gedf_reservation.h b/include/litmus/reservations/gedf_reservation.h
index e2a4a3dc5968..57f2fa7f00fc 100644
--- a/include/litmus/reservations/gedf_reservation.h
+++ b/include/litmus/reservations/gedf_reservation.h
@@ -22,19 +22,33 @@ struct gedf_reservation {
         struct cpu_entry* scheduled_on;
         int will_remove;
         int blocked;
+};
+
+struct gedf_task_reservation {
+        struct gedf_reservation gedf_res;
+        struct task_struct* task;
+};
+
+struct gedf_container_reservation {
+        struct gedf_reservation gedf_res;
+        lt_t max_budget;
         lt_t period;
         lt_t relative_deadline;
-        lt_t exec_cost;
 };
 
-long alloc_gedf_reservation(
-        struct gedf_reservation** _res,
+long alloc_gedf_container_reservation(
+        struct gedf_container_reservation** _res,
         int id,
-        lt_t exec_cost,
+        lt_t max_budget,
         lt_t period,
         lt_t relative_deadline
 );
 
+long alloc_gedf_task_reservation(
+        struct gedf_task_reservation** _res,
+        struct task_struct* task
+);
+
 /* environment for scheduling reservations via gedf */
 struct gedf_reservation_environment {
         struct reservation_environment env;
diff --git a/include/litmus/reservations/task_reservation.h b/include/litmus/reservations/task_reservation.h
deleted file mode 100644
index 0e0ef74591b6..000000000000
--- a/include/litmus/reservations/task_reservation.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#ifndef LITMUS_TASK_RESERVATION_H
-#define LITMUS_TASK_RESERVATION_H
-
-#include <litmus/reservations/ext_reservation.h>
-
-struct task_reservation_environment {
-        struct reservation_environment env;
-        struct task_struct* task;
-};
-
-long alloc_task_reservation_environment(
-        struct task_reservation_environment** _env,
-        struct task_struct* task
-);
-
-#endif