Revisions based on review comments.

* Simplified jobs.c.
* Fixed bug in density admissions check.
* Renamed rdeadline to be relative_deadline.

2 files changed, 10 insertions, 6 deletions

diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 00b434f83c75..bbeab994a817 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -47,18 +47,22 @@ void litmus_exit_task(struct task_struct *tsk);
 /*      Realtime utility macros */
 #define get_rt_flags(t)         (tsk_rt(t)->flags)
 #define set_rt_flags(t,f)       (tsk_rt(t)->flags=(f))
+#define is_priority_boosted(t)  (tsk_rt(t)->priority_boosted)
+#define get_boost_start(t)  (tsk_rt(t)->boost_start_time)
+
+/* task_params macros */
 #define get_exec_cost(t)        (tsk_rt(t)->task_params.exec_cost)
-#define get_exec_time(t)        (tsk_rt(t)->job_params.exec_time)
 #define get_rt_period(t)        (tsk_rt(t)->task_params.period)
-#define get_rt_rdeadline(t)     (tsk_rt(t)->task_params.rdeadline)
+#define get_rt_relative_deadline(t)     (tsk_rt(t)->task_params.relative_deadline)
 #define get_rt_phase(t)         (tsk_rt(t)->task_params.phase)
 #define get_partition(t)        (tsk_rt(t)->task_params.cpu)
+#define get_class(t)        (tsk_rt(t)->task_params.cls)
+
+/* job_param macros */
+#define get_exec_time(t)    (tsk_rt(t)->job_params.exec_time)
 #define get_deadline(t)         (tsk_rt(t)->job_params.deadline)
 #define get_release(t)          (tsk_rt(t)->job_params.release)
-#define get_class(t)            (tsk_rt(t)->task_params.cls)
 
-#define is_priority_boosted(t)  (tsk_rt(t)->priority_boosted)
-#define get_boost_start(t)      (tsk_rt(t)->boost_start_time)
 
 inline static int budget_exhausted(struct task_struct* t)
 {
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 0ddd8c134533..60d814248685 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -36,7 +36,7 @@ typedef enum {
 struct rt_task {
         lt_t            exec_cost;
         lt_t            period;
-        lt_t            rdeadline;
+        lt_t            relative_deadline;
         lt_t            phase;
         unsigned int    cpu;
         task_class_t    cls;