added support for np-sections in GEDF reservation.

Also, includes WIP of component allocator. This WIP is not included in
the makefile so it won't mess up the compilation.

9 files changed, 457 insertions, 102 deletions

diff --git a/include/litmus/reservations/ext_reservation.h b/include/litmus/reservations/ext_reservation.h
index 40c9cd9e098e..97b8bad916df 100644
--- a/include/litmus/reservations/ext_reservation.h
+++ b/include/litmus/reservations/ext_reservation.h
@@ -25,6 +25,7 @@ typedef void (*drain_budget_t) (
 
 typedef struct task_struct* (*dispatch_client_t) (
         struct reservation *reservation,
+        lt_t* time_slice,
         int cpu
 );
 
@@ -40,8 +41,15 @@ typedef void (*on_preempt_t) (
         int cpu
 );
 
+typedef int (*is_np_t) (
+        struct reservation *reservation,
+        int cpu
+);
+
 /* Destructor: called before scheduler is deactivated. */
-typedef void (*shutdown_t)(struct reservation *reservation);
+typedef void (*shutdown_t)(
+        struct reservation *reservation
+);
 
 struct reservation_ops {
         drain_budget_t drain_budget;
@@ -49,6 +57,7 @@ struct reservation_ops {
         dispatch_client_t dispatch_client;
         on_schedule_t on_schedule;
         on_preempt_t on_preempt;
+        is_np_t is_np;
         shutdown_t shutdown;
 };
 
@@ -58,6 +67,7 @@ struct reservation {
         /* exact meaning defined by impl. */
         lt_t priority;
         lt_t replenishment_time;
+        lt_t cur_budget;
 
         /* budget stats */
         lt_t budget_consumed; /* how much budget consumed in this allocation cycle? */
@@ -93,6 +103,7 @@ typedef void (*env_update_time_t) (
 
 typedef struct task_struct* (*env_dispatch_t) (
         struct reservation_environment* env,
+        lt_t* time_slice,
         int cpu);
 
 typedef void (*env_resume_t) (
@@ -103,12 +114,24 @@ typedef void (*env_suspend_t) (
         struct reservation_environment* env,
         int cpu);
 
-typedef void (*env_add_res_t) (struct reservation_environment* env,
-        struct reservation* res);
+typedef void (*env_add_res_t) (
+        struct reservation_environment* env,
+        struct reservation* res,
+        int cpu);
 
-typedef void (*env_remove_res_t) (struct reservation_environment* env,
+typedef void (*env_remove_res_t) (
+        struct reservation_environment* env,
         struct reservation* res,
-        int complete);
+        int complete,
+        int cpu);
+
+typedef struct reservation* (*env_find_res_t) (
+        struct reservation_environment* env,
+        int id);
+
+typedef int (*env_is_np_t) (
+        struct reservation_environment* env,
+        int cpu);
 
 typedef void (*env_shutdown_t) (
         struct reservation_environment* env);
@@ -120,12 +143,15 @@ struct reservation_environment_ops {
         env_suspend_t           suspend;
         env_add_res_t           add_res;
         env_remove_res_t        remove_res;
+        env_find_res_t          find_res_by_id;
+        env_is_np_t                     is_np;
         env_shutdown_t          shutdown;
 };
 
 struct reservation_environment {
         struct reservation_environment_ops* ops;
         struct reservation* res;
+        struct list_head all_reservations;
 };
 
 static inline void env_to_res_couple(
diff --git a/include/litmus/reservations/gedf_reservation.h b/include/litmus/reservations/gedf_reservation.h
index 2adaaabbcaf4..e39d632262a3 100644
--- a/include/litmus/reservations/gedf_reservation.h
+++ b/include/litmus/reservations/gedf_reservation.h
@@ -10,15 +10,14 @@
 /* ************************************************************************** */
 struct gedf_reservation {
         struct reservation res;
-        struct cpu_entry* linked_on;
+        struct gedf_cpu_entry* linked_on;
         lt_t cur_budget;
         int will_remove;
         int blocked;
 };
 
-struct cpu_entry {
+struct gedf_cpu_entry {
         int id;
-        struct hrtimer timer;
         struct bheap_node* hn;
         struct gedf_reservation* linked;
         struct gedf_reservation* scheduled;
@@ -60,7 +59,7 @@ struct gedf_reservation_environment {
         volatile int num_cpus;
 
         /* array of gedf cpu entries */
-        struct cpu_entry cpu_entries[NR_CPUS];
+        struct gedf_cpu_entry cpu_entries[NR_CPUS];
 
         /* used to order cpus for gedf purposes */
         struct bheap cpu_heap;
diff --git a/include/litmus/reservations/table_driven_ext_reservation.h b/include/litmus/reservations/table_driven_ext_reservation.h
index 51c32eadb419..100b4eea8cba 100644
--- a/include/litmus/reservations/table_driven_ext_reservation.h
+++ b/include/litmus/reservations/table_driven_ext_reservation.h
@@ -4,22 +4,14 @@
 #include <litmus/reservations/ext_reservation.h>
 
 /* ************************************************************************** */
-struct cpu_entry {
-        int id;
-        struct hrtimer timer;
-        struct bheap_node* hn;
-        struct reservation* linked;
-        struct reservation* scheduled;
-};
-
 struct mtd_reservation {
         struct reservation res;
+        volatile int in_env;
         lt_t major_cycle;
         unsigned int interval_index[NR_CPUS];
         unsigned int num_intervals[NR_CPUS];
         struct lt_interval* intervals[NR_CPUS];
 
-        int num_cur_intervals;
         struct lt_interval cur_interval[NR_CPUS];