sched_color: Refactored for locking

3 files changed, 44 insertions, 2 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index c587aa4b890c..8398a10171e0 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -59,7 +59,7 @@ void litmus_exit_task(struct task_struct *tsk);
 #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_server(t)            (tsk_rt(t)->server)
+#define is_server(t)            (tsk_rt(t)->is_server)
 
 #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/rt_param.h b/include/litmus/rt_param.h
index 31e8b8fed2a1..4d3a14992e0c 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -76,6 +76,7 @@ struct _rt_domain;
 struct bheap_node;
 struct release_heap;
 struct domain;
+struct rt_server;
 
 struct rt_job {
         /* Time instant the the job was or will be released.  */
@@ -119,7 +120,7 @@ struct rt_param {
         /* is the task present? (true if it can be scheduled) */
         unsigned int            present:1;
 
-        unsigned int            server:1;
+        unsigned int            is_server:1;
 
 #ifdef CONFIG_LITMUS_LOCKING
         /* Is the task being priority-boosted by a locking protocol? */
@@ -136,6 +137,8 @@ struct rt_param {
         struct rt_event *event;
 #endif
 
+        struct rt_server *server;
+
         /* user controlled parameters */
         struct rt_task          task_params;
 
diff --git a/include/litmus/rt_server.h b/include/litmus/rt_server.h
new file mode 100644
index 000000000000..17517790a104
--- /dev/null
+++ b/include/litmus/rt_server.h
@@ -0,0 +1,39 @@
+#ifndef __RT_SERVER_H
+#define __RT_SERVER_H
+
+#include <linux/sched.h>
+#include <litmus/litmus.h>
+#include <litmus/rt_domain.h>
+
+struct rt_server;
+
+typedef int (*need_preempt_t)(rt_domain_t *rt, struct task_struct *t);
+typedef void (*server_update_t)(struct rt_server *srv);
+typedef void (*server_requeue_t)(struct rt_server *srv, struct task_struct *t);
+typedef struct task_struct* (*server_take_t)(struct rt_server *srv);
+
+struct rt_server {
+        int sid;
+        struct task_struct*     linked;
+        rt_domain_t*            domain;
+        int running;
+
+        /* Does this server have a higher-priority task */
+        need_preempt_t          need_preempt;
+        /* System state has changed, so should server */
+        server_update_t         update;
+        /* Requeue task in domain */
+        server_requeue_t        requeue;
+        /* Take next task from domain */
+        server_take_t           take;
+};
+
+void init_rt_server(struct rt_server *server,
+                    int sid, rt_domain_t *domain,
+                    need_preempt_t need_preempt,
+                    server_requeue_t requeue,
+                    server_update_t update,
+                    server_take_t take);
+
+
+#endif