Switched to common server model for tasks and crit entries.

3 files changed, 37 insertions, 31 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index e9e26faddcea..dad0abb1a598 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -5,6 +5,8 @@
 #ifndef _LINUX_RT_PARAM_H_
 #define _LINUX_RT_PARAM_H_
 
+#include <litmus/server.h>
+
 /* Litmus time type. */
 typedef unsigned long long lt_t;
 
@@ -165,6 +167,8 @@ struct rt_param {
 
         unsigned int            is_server:1;
 
+        unsigned int            completed:1;
+
 #ifdef CONFIG_LITMUS_LOCKING
         /* Is the task being priority-boosted by a locking protocol? */
         unsigned int            priority_boosted:1;
@@ -180,8 +184,7 @@ struct rt_param {
         struct rt_event *event;
 #endif
 
-        struct rt_server *server;
-
+        struct server server;
 
         /* user controlled parameters */
         struct rt_task          task_params;
@@ -281,13 +284,12 @@ struct rt_param {
         void *color_ctrl_page_orig;
 #endif
         struct dgl_group_req *req;
+        enum server_state state;
 };
 
-/*      Possible RT flags       */
-#define RT_F_RUNNING            0x00000000
-#define RT_F_SLEEP              0x00000001
-#define RT_F_BLOCKED            0x00000002
-#define RT_F_EXIT_SEM           0x00000008
+#define RT_F_RUNNING 1
+#define RT_F_SLEEP   2
+#define RT_F_EXIT_SEM 4
 
 #endif
 
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 327f476aad74..12afd5525fca 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -28,15 +28,13 @@ struct mc_data {
 #define tsk_mc_data(t)   (tsk_rt(t)->mc_data)
 #define tsk_mc_crit(t) \
         (tsk_mc_data(t) ? tsk_mc_data(t)->mc_task.crit : CRIT_LEVEL_C)
-#define is_cblocked(t) (get_rt_flags(t) & RT_F_BLOCKED)
 #define is_ghost(t)                                                     \
-        (get_rt_job(t) < get_user_job(t) && (get_rt_flags(t) & RT_F_SLEEP))
+        (get_rt_job(t) < get_user_job(t) && (tsk_rt(t)->completed))
 #define ce_sid(ce) \
         (-((ce)->level * num_online_cpus() + crit_cpu(ce)->cpu + 1))
 
 #define TS "(%s/%d:%d:%d:%s)"
-#define TA(t) (t) ? tsk_mc_data(t) ? is_ghost(t) ? "ghost" : is_cblocked(t) ? "blocked" : t->comm \
-                                                 : t->comm : "NULL",    \
+#define TA(t) (t) ? is_ghost(t) ? "ghost" : t->comm : "NULL",   \
                 (t) ? t->pid : 1,                                       \
                 (t) ? get_rt_job(t) : 1,                                \
                 (t) ? get_user_job(t) : 1,                              \
@@ -45,7 +43,7 @@ struct mc_data {
         STRACE(TS " " fmt, TA(t), ##args)
 #define TRACE_CRIT_ENTRY(ce, fmt, args...)                      \
         STRACE("%s P%d, linked=" TS " " fmt,                    \
-              (ce)->domain->name, crit_cpu(ce)->cpu, TA((ce)->linked), ##args)
+              (ce)->domain->name, crit_cpu(ce)->cpu, TA((ce)->server.linked), ##args)
 
 /*
  * The MC-CE scheduler uses this as domain data.
@@ -62,23 +60,6 @@ struct ce_dom_data {
 };
 
 /**
- * enum crit_state - Logically add / remove CPUs from criticality levels.
- *
- * Global crit levels need to use a two step process to remove CPUs so
- * that the CPUs can be removed without holding domain locks.
- *
- * @CS_ACTIVE   The criticality entry can run a task
- * @CS_ACTIVATE The criticality entry can run a task, but hasn't had its
- *              position updated in a global heap. Set with ONLY CPU lock.
- * @CS_REMOVE   The criticality entry is logically removed, but hasn't had its
- *              position adjusted in a global heap. This should be set when
- *              ONLY the CPU state is locked.
- * @CS_REMOVED  The criticality entry has been removed from the crit level
- * @CS_BLOCKED  The criticality entry cannot run until an event occurs
- */
-enum crit_state { CS_ACTIVE, CS_ACTIVATE, CS_REMOVE, CS_REMOVED , CS_BLOCKED};
-
-/**
  * struct crit_entry - State of a CPU within each criticality level system.
  * @level       Criticality level of this entry
  * @linked      Logically running task, ghost or regular
@@ -89,10 +70,9 @@ enum crit_state { CS_ACTIVE, CS_ACTIVATE, CS_REMOVE, CS_REMOVED , CS_BLOCKED};
  * @node        Used to sort crit_entries by preemptability in global domains
  */
 struct crit_entry {
+        struct server           server;
         enum crit_level         level;
-        struct task_struct*     linked;
         struct domain*          domain;
-        enum crit_state         state;
 #ifdef CONFIG_MERGE_TIMERS
         struct rt_event         event;
 #else
diff --git a/include/litmus/server.h b/include/litmus/server.h
new file mode 100644
index 000000000000..c950325954ff
--- /dev/null
+++ b/include/litmus/server.h
@@ -0,0 +1,24 @@
+#ifndef __SERVER_H
+#define __SERVER_H
+
+enum server_state { SS_ACTIVE, SS_REMOVED , SS_BLOCKED};
+
+/*
+ * An accounting class only.
+ */
+struct server {
+        int                     sid;
+        unsigned int           *job;
+        int                     cpu;
+
+        unsigned int            in_transit:1;
+
+        enum server_state       state;
+        struct task_struct     *linked;
+};
+
+void server_init(struct server *server, int sid, int *job);
+void server_state_change(struct server *server, enum server_state state,
+                         unsigned int transit);
+
+#endif