4 files changed, 23 insertions, 3 deletions

diff --git a/include/litmus/edf_common.h b/include/litmus/edf_common.h
index f3c930b137..669900bc4c 100644
--- a/include/litmus/edf_common.h
+++ b/include/litmus/edf_common.h
@@ -12,7 +12,8 @@
 #include <litmus/rt_domain.h>
 
 
-void edf_domain_init(rt_domain_t* rt, check_resched_needed_t resched);
+void edf_domain_init(rt_domain_t* rt, check_resched_needed_t resched,
+                     release_at_t release);
 
 int edf_higher_prio(struct task_struct* first,
                     struct task_struct* second);
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 6e99e651d7..7a27c987b6 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -163,6 +163,18 @@ inline static int budget_exhausted(struct task_struct* t)
 
 #define get_release(t) ((t)->rt_param.job_params.release)
 
+/* Our notion of time within LITMUS: kernel monotonic time. */
+static inline lt_t litmus_clock(void)
+{
+        return ktime_to_ns(ktime_get());
+}
+
+/* A macro to convert from nanoseconds to ktime_t. */
+#define ns_to_ktime(t)          ktime_add_ns(ktime_set(0, 0), t)
+
+/* The high-resolution release timer for a task. */
+#define release_timer(t) ((t)->rt_param.job_params.release_timer)
+
 /* Honor the flag in the preempt_count variable that is set
  * when scheduling is in progress.
  */
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 79b6034f22..fd3c205bcc 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -8,7 +8,7 @@
 struct _rt_domain;
 
 typedef int (*check_resched_needed_t)(struct _rt_domain *rt);
-typedef void (*release_at_t)(struct task_struct *t, lt_t start);
+typedef void (*release_at_t)(struct task_struct *t);
 
 typedef struct _rt_domain {
         /* runnable rt tasks are in here */
@@ -22,6 +22,9 @@ typedef struct _rt_domain {
         /* how do we check if we need to kick another CPU? */
         check_resched_needed_t          check_resched;
 
+        /* how do we setup a job release? */
+        release_at_t                    setup_release;
+
         /* how are tasks ordered in the ready queue? */
         list_cmp_t                      order;
 } rt_domain_t;
@@ -33,7 +36,7 @@ typedef struct _rt_domain {
         (!list_empty(&(rt)->ready_queue))
 
 void rt_domain_init(rt_domain_t *rt, check_resched_needed_t f,
-                    list_cmp_t order);
+                    release_at_t g, list_cmp_t order);
 
 void __add_ready(rt_domain_t* rt, struct task_struct *new);
 void __add_release(rt_domain_t* rt, struct task_struct *task);
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 9fb5b19b78..3704924729 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -42,6 +42,10 @@ struct rt_job {
         lt_t    release;
         /* What is the current deadline? */
         lt_t    deadline;
+
+        /* The high-resolution timer used to control its release. */
+        struct hrtimer release_timer;
+
         /* How much service has this job received so far?
          */
         lt_t    exec_time;