1 files changed, 46 insertions, 6 deletions

diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 2026819..de29bac 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -33,6 +33,24 @@ typedef enum {
         PRECISE_ENFORCEMENT  /* budgets are enforced with hrtimers */
 } budget_policy_t;
 
+/* Release behaviors for jobs. PERIODIC and EARLY jobs
+   must end by calling sys_complete_job() (or equivalent)
+   to set up their next release and deadline. */
+typedef enum {
+        /* Jobs are released sporadically (provided job precedence
+       constraints are met). */
+        SPORADIC,
+
+        /* Jobs are released periodically (provided job precedence
+       constraints are met). */
+        PERIODIC,
+
+    /* Jobs are released immediately after meeting precedence
+       constraints. Beware this can peg your CPUs if used in
+       the wrong applications. Only supported by EDF schedulers. */
+        EARLY
+} release_policy_t;
+
 /* We use the common priority interpretation "lower index == higher priority",
  * which is commonly used in fixed-priority schedulability analysis papers.
  * So, a numerically lower priority value implies higher scheduling priority,
@@ -61,7 +79,8 @@ struct rt_task {
         unsigned int    cpu;
         unsigned int    priority;
         task_class_t    cls;
-        budget_policy_t budget_policy; /* ignored by pfair */
+        budget_policy_t  budget_policy;  /* ignored by pfair */
+        release_policy_t release_policy;
 };
 
 union np_flag {
@@ -89,11 +108,29 @@ union np_flag {
  * determining preemption/migration overheads).
  */
 struct control_page {
+        /* This flag is used by userspace to communicate non-preempive
+         * sections. */
         volatile union np_flag sched;
 
+        volatile uint64_t irq_count; /* Incremented by the kernel each time an IRQ is
+                                      * handled. */
+
+        /* Locking overhead tracing: userspace records here the time stamp
+         * and IRQ counter prior to starting the system call. */
+        uint64_t ts_syscall_start;  /* Feather-Trace cycles */
+        uint64_t irq_syscall_start; /* Snapshot of irq_count when the syscall
+                                     * started. */
+
         /* to be extended */
 };
 
+/* Expected offsets within the control page. */
+
+#define LITMUS_CP_OFFSET_SCHED          0
+#define LITMUS_CP_OFFSET_IRQ_COUNT      8
+#define LITMUS_CP_OFFSET_TS_SC_START    16
+#define LITMUS_CP_OFFSET_IRQ_SC_START   24
+
 /* don't export internal data structures to user space (liblitmus) */
 #ifdef __KERNEL__
 
@@ -142,11 +179,19 @@ struct rt_param {
         /* is the task present? (true if it can be scheduled) */
         unsigned int            present:1;
 
+        /* has the task completed? */
+        unsigned int            completed:1;
+
 #ifdef CONFIG_LITMUS_LOCKING
         /* Is the task being priority-boosted by a locking protocol? */
         unsigned int            priority_boosted:1;
         /* If so, when did this start? */
         lt_t                    boost_start_time;
+
+        /* How many LITMUS^RT locks does the task currently hold/wait for? */
+        unsigned int            num_locks_held;
+        /* How many PCP/SRP locks does the task currently hold/wait for? */
+        unsigned int            num_local_locks_held;
 #endif
 
         /* user controlled parameters */
@@ -233,11 +278,6 @@ struct rt_param {
         lt_t tot_exec_time;
 };
 
-/*      Possible RT flags       */
-#define RT_F_RUNNING            0x00000000
-#define RT_F_SLEEP              0x00000001
-#define RT_F_EXIT_SEM           0x00000008
-
 #endif
 
 #endif