6 files changed, 35 insertions, 10 deletions

diff --git a/include/litmus/domain.h b/include/litmus/domain.h
index eeef068d9ce2..6bcd558c7c32 100644
--- a/include/litmus/domain.h
+++ b/include/litmus/domain.h
@@ -2,6 +2,7 @@
  * --Todo--
  * Naming: this should become rt_domain while the old rt_domain should be
  * changed to sd_domain (sporadic) or pd_domain (periodic).
+ * task_new: need to add and use this method
  */
 #ifndef _LITMUS_DOMAIN_H_
 #define _LITMUS_DOMAIN_H_
@@ -12,11 +13,13 @@ typedef void (*requeue_t)(struct domain*, struct task_struct*);
 typedef struct task_struct* (*peek_ready_t)(struct domain*);
 typedef struct task_struct* (*take_ready_t)(struct domain*);
 typedef int (*preempt_needed_t)(struct domain*, struct task_struct*);
+typedef int (*task_prio_t)(struct task_struct*, struct task_struct*);
 
 typedef struct domain {
-        raw_spinlock_t*         lock; /* for coarse serialization     */
-        struct list_head        list; /* list membership              */
-        void*                   data; /* implementation-specific data */
+        raw_spinlock_t*         lock; /* for coarse serialization       */
+        struct list_head        list; /* list membership                */
+        void*                   data; /* implementation-specific data   */
+        char*                   name; /* for debugging                  */
 
         /* add a task to the domain */
         requeue_t               requeue;
@@ -24,14 +27,23 @@ typedef struct domain {
         peek_ready_t            peek_ready;
         /* remove and return next ready task */
         take_ready_t            take_ready;
-        /* return true if the domain has a higher priority ready task */
+        /* return true if the domain has a task which should preempt the
+         * task given
+         */
         preempt_needed_t        preempt_needed;
+        /* for tasks within this domain, returns true if the first has
+         * has a higher priority than the second
+         */
+        task_prio_t             higher_prio;
+
+        /* task_new_t           add; */
 } domain_t;
 
-void domain_init(domain_t *dom, raw_spinlock_t *lock,
+void domain_init(domain_t *dom,
+                 raw_spinlock_t *lock,
                  requeue_t requeue,
                  peek_ready_t peek_ready,
                  take_ready_t take_ready,
-                 preempt_needed_t preempt_needed);
-
+                 preempt_needed_t preempt_needed,
+                 task_prio_t priority);
 #endif
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 94086e2b38db..2112eecd1dc8 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -55,6 +55,7 @@ void litmus_exit_task(struct task_struct *tsk);
 #define get_deadline(t)         (tsk_rt(t)->job_params.deadline)
 #define get_release(t)          (tsk_rt(t)->job_params.release)
 #define get_class(t)            (tsk_rt(t)->task_params.cls)
+#define get_task_domain(t)      (tsk_rt(t)->_domain)
 
 #define is_priority_boosted(t)  (tsk_rt(t)->priority_boosted)
 #define get_boost_start(t)      (tsk_rt(t)->boost_start_time)
diff --git a/include/litmus/preempt.h b/include/litmus/preempt.h
index 260c6fe17986..29bf9bc47daf 100644
--- a/include/litmus/preempt.h
+++ b/include/litmus/preempt.h
@@ -8,11 +8,13 @@
 
 #include <litmus/debug_trace.h>
 
+
 extern DEFINE_PER_CPU_SHARED_ALIGNED(atomic_t, resched_state);
 
 #ifdef CONFIG_DEBUG_KERNEL
 const char* sched_state_name(int s);
-#define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args)
+//#define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args)
+#define TRACE_STATE(fmt, args...) /* ignore */
 #else
 #define TRACE_STATE(fmt, args...) /* ignore */
 #endif
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index cba1979744ca..b5cf95ffd488 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -79,10 +79,12 @@ void rt_domain_init(rt_domain_t *rt, bheap_prio_t order,
                     check_resched_needed_t check,
                     release_jobs_t release);
 
-void pd_domain_init(domain_t *dom, bheap_prio_t order,
+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);
+                    preempt_needed_t preempt_needed,
+                    task_prio_t priority);
 
 void pd_domain_free(domain_t *dom);
 
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 4ded23d658d0..e247fb515e8c 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -72,6 +72,7 @@ struct control_page {
 struct _rt_domain;
 struct bheap_node;
 struct release_heap;
+struct domain;
 
 struct rt_job {
         /* Time instant the the job was or will be released.  */
@@ -177,6 +178,9 @@ struct rt_param {
         int old_policy;
         int old_prio;
 
+        /* TODO: rename */
+        struct domain *_domain;
+
         /* ready queue for this task */
         struct _rt_domain* domain;
 
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 66910773f430..3ca5576f7662 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -30,6 +30,10 @@ struct mc_data {
         struct mc_job mc_job;
 };
 
+#define tsk_mc_data(t)   (tsk_rt(t)->mc_data)
+#define tsk_mc_crit(t)   (tsk_mc_data(t)->mc_task.crit)
+#define is_ghost(t)      (tsk_mc_data(t)->mc_job.is_ghost)
+
 #endif /* __KERNEL__ */
 
 #endif