Revisions based on review comments.

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

1 files changed, 9 insertions, 7 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 0ee0926f37d3..19de1201d964 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -103,8 +103,8 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
         }
 
         /* set relative deadline to be implicit if left unspecified */
-        if (tp.rdeadline == 0)
-                tp.rdeadline = tp.period;
+        if (tp.relative_deadline == 0)
+                tp.relative_deadline = tp.period;
 
         if (tp.exec_cost <= 0)
                 goto out_unlock;
@@ -112,10 +112,10 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
                 goto out_unlock;
         if (!cpu_online(tp.cpu))
                 goto out_unlock;
-        if (tp.rdeadline < tp.exec_cost)
+        if (min(tp.relative_deadline, tp.period) < tp.exec_cost) /*density check*/
         {
                 printk(KERN_INFO "litmus: real-time task %d rejected "
-                       "because wcet greater than relative deadline\n", pid);
+                       "because task density > 1.0\n", pid);
                 goto out_unlock;
         }
         if (tp.cls != RT_CLASS_HARD &&
@@ -325,12 +325,14 @@ long litmus_admit_task(struct task_struct* tsk)
 
         BUG_ON(is_realtime(tsk));
 
-        if (get_rt_rdeadline(tsk) == 0 ||
-            get_exec_cost(tsk) > get_rt_rdeadline(tsk)) {
+        if (get_rt_relative_deadline(tsk) == 0 ||
+            get_exec_cost(tsk) >
+                        min(get_rt_relative_deadline(tsk), get_period(tsk)) ) {
                 TRACE_TASK(tsk,
                         "litmus admit: invalid task parameters "
                         "(e = %lu, p = %lu, d = %lu)\n",
-                        get_exec_cost(tsk), get_rt_period(tsk), get_rt_rdeadline(tsk));
+                        get_exec_cost(tsk), get_rt_period(tsk),
+                        get_rt_relative_deadline(tsk));
                 retval = -EINVAL;
                 goto out;
         }