1 files changed, 51 insertions, 7 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 4293575d3472..2ced0dba067d 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -30,7 +30,7 @@ typedef enum {
 typedef enum {
         NO_ENFORCEMENT,      /* job may overrun unhindered */
         QUANTUM_ENFORCEMENT, /* budgets are only checked on quantum boundaries */
-        PRECISE_ENFORCEMENT  /* NOT IMPLEMENTED - enforced with hrtimers */
+        PRECISE_ENFORCEMENT  /* budgets are enforced with hrtimers */
 } budget_policy_t;
 
 struct rt_task {
@@ -42,6 +42,16 @@ struct rt_task {
         budget_policy_t budget_policy; /* ignored by pfair */
 };
 
+union np_flag {
+        uint32_t raw;
+        struct {
+                /* Is the task currently in a non-preemptive section? */
+                uint32_t flag:31;
+                /* Should the task call into the scheduler? */
+                uint32_t preempt:1;
+        } np;
+};
+
 /* The definition of the data that is shared between the kernel and real-time
  * tasks via a shared page (see litmus/ctrldev.c).
  *
@@ -57,16 +67,33 @@ struct rt_task {
  * determining preemption/migration overheads).
  */
 struct control_page {
-        /* Is the task currently in a non-preemptive section? */
-        int np_flag;
-        /* Should the task call into the kernel when it leaves
-         * its non-preemptive section? */
-        int delayed_preemption;
+        volatile union np_flag sched;
 
         /* locking overhead tracing: time stamp prior to system call */
         uint64_t ts_syscall_start; /* Feather-Trace cycles */
 
-        /* to be extended */
+        int colors_updated:8;
+};
+
+#ifndef __KERNEL__
+/*
+ * XXX This is a terrible hack so liblitmus can use the PAGE_SIZE macro.
+ * We should fix liblitmus to do setup the page size at runtime.
+ */
+#define CACHE_LINE_SIZE 64
+#if (ARCH == x86_64)
+#define PAGE_SIZE 4096
+#elif (ARCH == sparc64)
+#define PAGE_SIZE 8192
+#endif
+#endif /* ifndef __KERNEL__ */
+
+typedef uint8_t color_t;
+#define COLORS_PER_CONTROL_PAGE (PAGE_SIZE / (2 * sizeof(color_t)))
+struct color_ctrl_page {
+        color_t colors[COLORS_PER_CONTROL_PAGE];
+        /* must be same type to guarantee equal array sizes */
+        color_t pages[COLORS_PER_CONTROL_PAGE];
 };
 
 /* don't export internal data structures to user space (liblitmus) */
@@ -76,6 +103,8 @@ struct _rt_domain;
 struct bheap_node;
 struct release_heap;
 struct domain;
+struct rt_server;
+struct dgl_group_req;
 
 struct rt_job {
         /* Time instant the the job was or will be released.  */
@@ -119,6 +148,8 @@ struct rt_param {
         /* is the task present? (true if it can be scheduled) */
         unsigned int            present:1;
 
+        unsigned int            is_server:1;
+
 #ifdef CONFIG_LITMUS_LOCKING
         /* Is the task being priority-boosted by a locking protocol? */
         unsigned int            priority_boosted:1;
@@ -134,6 +165,9 @@ struct rt_param {
         struct rt_event *event;
 #endif
 
+        struct rt_server *server;
+
+
         /* user controlled parameters */
         struct rt_task          task_params;
 
@@ -213,6 +247,16 @@ struct rt_param {
 
         /* Pointer to the page shared between userspace and kernel. */
         struct control_page * ctrl_page;
+
+        lt_t            total_tardy;
+        lt_t            max_tardy;
+        unsigned int    missed;
+
+        lt_t max_exec_time;
+        lt_t tot_exec_time;
+        lt_t last_exec_time;
+        struct color_ctrl_page *color_ctrl_page;
+        struct dgl_group_req *req;
 };
 
 /*      Possible RT flags       */