1 files changed, 55 insertions, 1 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 20268190757f..a8c82eed5562 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -91,7 +91,31 @@ union np_flag {
 struct control_page {
         volatile union np_flag sched;
 
-        /* to be extended */
+        /* locking overhead tracing: time stamp prior to system call */
+        uint64_t ts_syscall_start; /* Feather-Trace cycles */
+
+        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) */
@@ -100,6 +124,9 @@ struct control_page {
 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.  */
@@ -107,6 +134,10 @@ struct rt_job {
         /* What is the current deadline? */
         lt_t    deadline;
 
+        lt_t    real_release;
+        lt_t    real_deadline;
+        unsigned int fake_job_no;
+
         /* How much service has this job received so far? */
         lt_t    exec_time;
 
@@ -127,6 +158,9 @@ struct rt_job {
 };
 
 struct pfair_param;
+#ifdef CONFIG_PLUGIN_MC
+struct mc_data;
+#endif
 
 /*      RT task parameters for scheduling extensions
  *      These parameters are inherited during clone and therefore must
@@ -142,6 +176,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;
@@ -149,6 +185,17 @@ struct rt_param {
         lt_t                    boost_start_time;
 #endif
 
+#ifdef CONFIG_PLUGIN_MC
+        /* mixed criticality specific data */
+        struct mc_data *mc_data;
+#endif
+#ifdef CONFIG_MERGE_TIMERS
+        struct rt_event *event;
+#endif
+
+        struct rt_server *server;
+
+
         /* user controlled parameters */
         struct rt_task          task_params;
 
@@ -203,6 +250,9 @@ struct rt_param {
         int old_policy;
         int old_prio;
 
+        /* TODO: rename */
+        struct domain *_domain;
+
         /* ready queue for this task */
         struct _rt_domain* domain;
 
@@ -229,8 +279,12 @@ struct rt_param {
         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       */