Backup Commit 2

6 files changed, 92 insertions, 75 deletions

diff --git a/include/litmus/reservations/ext_reservation.h b/include/litmus/reservations/ext_reservation.h
index b5fedf46a2cc..7ec326bd14bd 100644
--- a/include/litmus/reservations/ext_reservation.h
+++ b/include/litmus/reservations/ext_reservation.h
@@ -2,11 +2,8 @@
 #define LITMUS_EXT_RESERVATION_H
 
 #include <linux/list.h>
-#include <linux/hrtimer.h>
 
 #include <litmus/debug_trace.h>
-#include <litmus/bheap.h>
-#include <litmus/rt_domain.h>
 #include <litmus/reservations/budget-notifier.h>
 
 struct reservation_environment;
@@ -52,7 +49,6 @@ struct reservation_ops {
 
 struct reservation {
         unsigned int id;
-        unsigned int kind;
 
         /* exact meaning defined by impl. */
         lt_t priority;
@@ -86,7 +82,7 @@ void init_ext_reservation(struct reservation* res);
 void clean_up_ext_reservation(struct reservation* res);
 
 /* ************************************************************************** */
-typedef void (*env_advance_time_t) (
+typedef void (*env_update_time_t) (
         struct reservation_environment* env,
         lt_t how_much,
         int cpu);
@@ -106,17 +102,14 @@ typedef void (*env_suspend_t) (
         int cpu);
 
 typedef void (*env_add_res_t) (struct reservation_environment* env,
-        struct reservation* res,
-        int cpu);
+        struct reservation* res);
 
 typedef void (*env_remove_res_t) (struct reservation_environment* env,
         struct reservation* res,
-        int complete,
-        int cpu);
+        int complete);
 
 typedef void (*env_shutdown_t) (
-        struct reservation_environment* env,
-        int cpu);
+        struct reservation_environment* env);
 
 struct reservation_environment_ops {
         env_update_time_t       update_time;
@@ -130,6 +123,15 @@ struct reservation_environment_ops {
 
 struct reservation_environment {
         struct reservation_environment_ops* ops;
+        struct reservation* res;
 };
 
+static inline void env_to_res_couple(
+        struct reservation_environment* env,
+        struct reservation* res)
+{
+        res->env = env;
+        env->res = res;
+}
+
 #endif
diff --git a/include/litmus/reservations/gedf_reservation.h b/include/litmus/reservations/gedf_reservation.h
index f00c21e37fac..235591a0897b 100644
--- a/include/litmus/reservations/gedf_reservation.h
+++ b/include/litmus/reservations/gedf_reservation.h
@@ -1,6 +1,10 @@
 #ifndef LITMUS_GEDF_RESERVATION_H
 #define LITMUS_GEDF_RESERVATION_H
 
+#include <linux/hrtimer.h>
+
+#include <litmus/bheap.h>
+#include <litmus/rt_domain.h>
 #include <litmus/reservations/ext_reservation.h>
 
 /* ************************************************************************** */
@@ -14,8 +18,8 @@ struct cpu_entry {
 
 struct gedf_reservation {
         struct reservation res;
-        struct cpu_entry linked_on;
-        struct cpu_entry scheduled_on;
+        struct cpu_entry* linked_on;
+        struct cpu_entry* scheduled_on;
         int will_remove;
         int blocked;
         lt_t period;
@@ -24,7 +28,7 @@ struct gedf_reservation {
 };
 
 long alloc_gedf_reservation(
-        struct reservation** _res,
+        struct gedf_reservation** _res,
         int id,
         lt_t exec_cost,
         lt_t period,
@@ -34,6 +38,7 @@ long alloc_gedf_reservation(
 /* environment for scheduling reservations via gedf */
 struct gedf_reservation_environment {
         struct reservation_environment env;
+        struct list_head all_reservations;
         /* number of active cpus in reservation */
         int num_cpus;
         /* array of gedf cpu entries */
@@ -45,9 +50,6 @@ struct gedf_reservation_environment {
         struct bheap cpu_heap;
         struct bheap_node cpu_node[NR_CPUS];
 
-        /* operations */
-        struct reservation_environment_ops ops;
-
         rt_domain_t domain;
 };
 
diff --git a/include/litmus/reservations/reservation.h b/include/litmus/reservations/reservation.h
index 3dce3a47a2fa..1752dac4e698 100644
--- a/include/litmus/reservations/reservation.h
+++ b/include/litmus/reservations/reservation.h
@@ -202,8 +202,6 @@ struct sup_reservation_environment {
         lt_t next_scheduler_update;
         /* set to true if a call to sup_dispatch() is imminent */
         bool will_schedule;
-
-        struct res_env_ops ops;
 };
 
 /* Contract:
@@ -223,46 +221,4 @@ struct task_struct* sup_dispatch(struct sup_reservation_environment* sup_env);
 struct reservation* sup_find_by_id(struct sup_reservation_environment* sup_env,
         unsigned int id);
 
-/* ************************************************************************* */
-/* cpu_entry struct */
-typedef struct {
-        int cpu;
-        struct task_struct* linked;
-        struct task_struct* scheduled;
-        struct bheap_node* hn;
-        struct list_node* ln;
-} cpu_entry_t;
-
-/* Hierarchical reservation environment */
-struct ext_reservation_environment {
-        struct reservation environment env;
-
-        /* only used for global reservation environments */
-        raw_spinlock_t lock;
-
-        /* ordered by priority */
-        struct list_head active_reservations;
-
-        /* ordered by next_replenishment */
-        struct list_head depleted_reservations;
-
-        /* unordered */
-        struct list_head inactive_reservations;
-
-        /* list of all reservations */
-        struct list_head all_reservations;
-
-        lt_t next_scheduler_update;
-        bool will_scheduled;
-}
-
-/* Hierarchical reservation */
-struct ext_reservation {
-        /* reservation data */
-        struct reservation res;
-
-        /* reservation environment for child reservations */
-        struct list_head child_envs;
-};
-
 #endif
diff --git a/include/litmus/reservations/table_driven_ext_reservation.h b/include/litmus/reservations/table_driven_ext_reservation.h
new file mode 100644
index 000000000000..414791ee9261
--- /dev/null
+++ b/include/litmus/reservations/table_driven_ext_reservation.h
@@ -0,0 +1,58 @@
+#ifndef LITMUS_TD_RESERVATION_H
+#define LITMUS_TD_RESERVATION_H
+
+#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 gedf_reservation {
+        struct reservation res;
+        struct cpu_entry linked_on;
+        struct cpu_entry scheduled_on;
+        int will_remove;
+        int blocked;
+        lt_t period;
+        lt_t relative_deadline;
+        lt_t exec_cost;
+};
+
+long alloc_gedf_reservation(
+        struct reservation** _res,
+        int id,
+        lt_t exec_cost,
+        lt_t period,
+        lt_t relative_deadline
+);
+
+/* environment for scheduling reservations via gedf */
+struct td_reservation_environment {
+        struct reservation_environment env;
+        /* number of active cpus in reservation */
+        int num_cpus;
+        /* array of gedf cpu entries */
+        struct cpu_entry cpu_entries[NR_CPUS];
+        /* smp_processor_id to environment cpu array offset mapping */
+        int cpu_mapping[NR_CPUS];
+
+        /* used to order cpus for gedf purposes */
+        struct bheap cpu_heap;
+        struct bheap_node cpu_node[NR_CPUS];
+
+        /* operations */
+        struct reservation_environment_ops ops;
+
+        rt_domain_t domain;
+};
+
+long alloc_td_reservation_environment(
+        struct td_reservation_environment** _env
+);
+
+#endif
diff --git a/include/litmus/reservations/task_reservation.h b/include/litmus/reservations/task_reservation.h
index d54a789ff3e2..0e0ef74591b6 100644
--- a/include/litmus/reservations/task_reservation.h
+++ b/include/litmus/reservations/task_reservation.h
@@ -1,15 +1,15 @@
-#ifndef LITMUS_GEDF_RESERVATION_H
-#define LITMUS_GEDF_RESERVATION_H
+#ifndef LITMUS_TASK_RESERVATION_H
+#define LITMUS_TASK_RESERVATION_H
 
 #include <litmus/reservations/ext_reservation.h>
 
 struct task_reservation_environment {
-        struct reservation_environment res;
+        struct reservation_environment env;
         struct task_struct* task;
 };
 
-void task_reservation_environment_init(
-        struct task_reservation_environment* task_env,
+long alloc_task_reservation_environment(
+        struct task_reservation_environment** _env,
         struct task_struct* task
 );
 
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 5a7fb59bd750..0fabd7e6ea55 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -5,8 +5,6 @@
 #ifndef __UNC_RT_DOMAIN_H__
 #define __UNC_RT_DOMAIN_H__
 
-#include <linux/rbtree.h>
-
 #include <litmus/bheap.h>
 #include <litmus/binheap.h>
 #include <litmus/reservations/ext_reservation.h>
@@ -69,8 +67,8 @@ struct release_heap {
         struct list_head                list_head;
 };
 
-static void suspend_releases(rt_domain_t* rt);
-static void resume_releases(rt_domain_t* rt);
+void suspend_releases(rt_domain_t* rt);
+void resume_releases(rt_domain_t* rt);
 
 static inline struct task_struct* __next_ready(rt_domain_t* rt)
 {
@@ -83,7 +81,7 @@ static inline struct task_struct* __next_ready(rt_domain_t* rt)
 
 static inline struct reservation* __next_ready_res(rt_domain_t* rt)
 {
-        struct bheap_node *n = bheap_peek(rt->order, &rt->ready_queue);
+        struct bheap_node *hn = bheap_peek(rt->order, &rt->ready_queue);
         if (hn)
                 return bheap2res(hn);
         else
@@ -98,9 +96,10 @@ void __add_ready(rt_domain_t* rt, struct task_struct *new);
 void __merge_ready(rt_domain_t* rt, struct bheap *tasks);
 void __add_release(rt_domain_t* rt, struct task_struct *task);
 
-void __add_ready_res(rt_domain* rt, struct reservation* new);
+void __add_ready_res(rt_domain_t* rt, struct reservation* new);
 void __merge_ready_res(rt_domain_t* rt, struct bheap *res);
 void __add_release_res(rt_domain_t* rt, struct reservation* res);
+void __add_release_res_no_timer(rt_domain_t* rt, struct reservation* res);
 
 static inline struct task_struct* __take_ready(rt_domain_t* rt)
 {
@@ -146,7 +145,7 @@ static inline int  is_queued(struct task_struct *t)
 
 static inline int  is_queued_res(struct reservation* res)
 {
-        BUG_ON(!cres->heap_node);
+        BUG_ON(!res->heap_node);
         return bheap_node_in_heap(res->heap_node);
 }
 
@@ -228,8 +227,8 @@ static inline void add_release_res(rt_domain_t* rt, struct reservation* res)
 {
         unsigned long flags;
         raw_spin_lock_irqsave(&rt->tobe_lock, flags);
-        __add_release_res(rt, task);
-        raw_spin_unlock_irqstore(&rt->tobe_lock, flags);
+        __add_release_res(rt, res);
+        raw_spin_unlock_irqrestore(&rt->tobe_lock, flags);
 }
 
 #ifdef CONFIG_RELEASE_MASTER