created generic domain interface for tasks

5 files changed, 82 insertions, 9 deletions

diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index ac249292e866..cba1979744ca 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -6,6 +6,7 @@
 #define __UNC_RT_DOMAIN_H__
 
 #include <litmus/bheap.h>
+#include <litmus/domain.h>
 
 #define RELEASE_QUEUE_SLOTS 127 /* prime */
 
@@ -76,7 +77,14 @@ static inline struct task_struct* __next_ready(rt_domain_t* rt)
 
 void rt_domain_init(rt_domain_t *rt, bheap_prio_t order,
                     check_resched_needed_t check,
-                    release_jobs_t relase);
+                    release_jobs_t release);
+
+void pd_domain_init(domain_t *dom, bheap_prio_t order,
+                    check_resched_needed_t check,
+                    release_jobs_t release,
+                    preempt_needed_t preempt_needed);
+
+void pd_domain_free(domain_t *dom);
 
 void __add_ready(rt_domain_t* rt, struct task_struct *new);
 void __merge_ready(rt_domain_t* rt, struct bheap *tasks);
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 941a9f4470cc..66910773f430 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -13,7 +13,6 @@ enum crit_level {
         NUM_CRIT_LEVELS = 4,
 };
 
-
 struct mc_task {
         enum crit_level crit;
 };
diff --git a/litmus/Makefile b/litmus/Makefile
index 782022be6f28..7d7003592138 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -17,7 +17,8 @@ obj-y     = sched_plugin.o litmus.o \
             bheap.o \
             ctrldev.o \
             sched_gsn_edf.o \
-            sched_psn_edf.o
+            sched_psn_edf.o \
+            domain.o
 
 obj-$(CONFIG_PLUGIN_CEDF) += sched_cedf.o
 obj-$(CONFIG_PLUGIN_PFAIR) += sched_pfair.o
diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index fd0e6c235e1b..f781a2c61fc6 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -14,13 +14,11 @@
 #include <litmus/litmus.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/sched_trace.h>
-
 #include <litmus/rt_domain.h>
-
 #include <litmus/trace.h>
-
 #include <litmus/bheap.h>
 
+
 /* Uncomment when debugging timer races... */
 #if 0
 #define VTRACE_TASK TRACE_TASK
@@ -354,3 +352,64 @@ void __add_release(rt_domain_t* rt, struct task_struct *task)
         TS_SCHED2_END(task);
 }
 
+/******************************************************************************
+ * domain_t wrapper
+ ******************************************************************************/
+
+/* pd_requeue - calls underlying rt_domain add methods.
+ * If the task is not yet released, it is inserted into the rt_domain
+ * ready queue. Otherwise, it is queued for release.
+ *
+ * Assumes the caller already holds dom->lock.
+ */
+static void pd_requeue(domain_t *dom, struct task_struct *task)
+{
+        rt_domain_t *domain = (rt_domain_t*)dom->data;
+        BUG_ON(!task || !is_realtime(task));
+        BUG_ON(is_queued(task));
+
+        if (is_released(task, litmus_clock())) {
+                __add_ready(domain, task);
+        } else {
+                /* task has to wait for next release */
+                add_release(domain, task);
+        }
+}
+
+/* pd_take_ready - removes and returns the next ready task from the rt_domain
+ *
+ * Assumes the caller already holds dom->lock.
+ */
+static struct task_struct* pd_take_ready(domain_t *dom)
+{
+        return __take_ready((rt_domain_t*)dom->data);
+}
+
+/* pd_peek_ready - returns the head of the rt_domain ready queue
+ *
+ * Assumes the caller already holds dom->lock.
+ */
+static struct task_struct* pd_peek_ready(domain_t *dom)
+{
+        return __next_ready((rt_domain_t*)dom->data);
+}
+
+/* pd_domain_init - create a generic domain wrapper for an rt_domain
+ */
+void pd_domain_init(domain_t *dom, bheap_prio_t order,
+                    check_resched_needed_t check,
+                    release_jobs_t release,
+                    preempt_needed_t preempt_needed)
+{
+        rt_domain_t *domain = kmalloc(sizeof(rt_domain_t), GFP_ATOMIC);
+
+        rt_domain_init(domain, order, check, release);
+        domain_init(dom, &domain->ready_lock,
+                    pd_requeue, pd_peek_ready, pd_take_ready,
+                    preempt_needed);
+}
+
+void pd_domain_free(domain_t *dom)
+{
+        kfree(dom->data);
+}
diff --git a/litmus/sched_mc.c b/litmus/sched_mc.c
index eb5728c97c87..dcf86d60275a 100644
--- a/litmus/sched_mc.c
+++ b/litmus/sched_mc.c
@@ -1,4 +1,4 @@
-/*
+/**
  * litmus/sched_mc.c
  *
  * Implementation of the Mixed Criticality scheduling algorithm.
@@ -8,6 +8,12 @@
  * This version uses the simple approach and serializes all scheduling
  * decisions by the use of a queue lock. This is probably not the
  * best way to do it, but it should suffice for now.
+ *
+ * --Todo--
+ * Timer Accounting: adjusting the clock values of the ghost timer using
+ * the _tick() method is relatively expensive. This should be changed.
+ * Locks: Accesses to domains should be serialized using a per-domain lock.
+ * CPU locks should be properly used e.g. wip-semi-part
  */
 
 #include <linux/spinlock.h>
@@ -586,9 +592,9 @@ static noinline void requeue(struct task_struct* task)
         /* sanity check before insertion */
         BUG_ON(is_queued(task));
 
-        if (is_released(task, litmus_clock()))
+        if (is_released(task, litmus_clock())) {
                 __add_ready(tsk_rt(task)->domain, task);
-        else {
+        } else {
                 /* it has got to wait */
                 add_release(tsk_rt(task)->domain, task);
         }