printk() info for tasks that fail to be admitted

2 files changed, 25 insertions, 17 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 112e269a6348..6c0ad0b4513a 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -128,7 +128,9 @@ asmlinkage long sys_set_rt_task_param(pid_t pid, struct rt_task __user * param)
         if (min(tp.relative_deadline, tp.period) < tp.exec_cost) /*density check*/
         {
                 printk(KERN_INFO "litmus: real-time task %d rejected "
-                       "because task density > 1.0\n", pid);
+                       "because task density > 1.0: exec_cost = %llu, deadline = %llu\n",
+                           tp.exec_cost, min(tp.relative_deadline, tp.period),
+                           pid);
                 goto out_unlock;
         }
         if (tp.cls != RT_CLASS_HARD &&
@@ -572,6 +574,12 @@ long litmus_admit_task(struct task_struct* tsk)
         if (get_rt_relative_deadline(tsk) == 0 ||
             get_exec_cost(tsk) >
                         min(get_rt_relative_deadline(tsk), get_rt_period(tsk)) ) {
+                printk("%s/%d "
+                        "litmus admit: invalid task parameters "
+                        "(e = %lu, p = %lu, d = %lu)\n",
+                        tsk->comm, tsk->pid,
+                        get_exec_cost(tsk), get_rt_period(tsk),
+                        get_rt_relative_deadline(tsk));
                 TRACE_TASK(tsk,
                         "litmus admit: invalid task parameters "
                         "(e = %lu, p = %lu, d = %lu)\n",
@@ -582,6 +590,9 @@ long litmus_admit_task(struct task_struct* tsk)
         }
 
         if (!cpu_online(get_partition(tsk))) {
+                printk("%s/%d "
+                        "litmus admit: cpu %d is not online\n",
+                        tsk->comm, tsk->pid, get_partition(tsk));
                 TRACE_TASK(tsk, "litmus admit: cpu %d is not online\n",
                            get_partition(tsk));
                 retval = -EINVAL;
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 1a7f0ffdae33..c4df3778c6a2 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -206,14 +206,14 @@ static void cedf_track_in_top_m(struct task_struct *t)
 
         //BUG_ON(binheap_is_in_heap(&tsk_rt(t)->budget.top_m_node));
         if (binheap_is_in_heap(&tsk_rt(t)->budget.top_m_node)) {
-                TRACE_TASK(t, "apparently already being tracked. top-m?: %s\n",
-                                   (bt_flag_is_set(t, BTF_IS_TOP_M)) ? "Yes":"No");
+//              TRACE_TASK(t, "apparently already being tracked. top-m?: %s\n",
+//                                 (bt_flag_is_set(t, BTF_IS_TOP_M)) ? "Yes":"No");
                 return;
         }
 
         /* TODO: do cluster_size-1 if release master is in this cluster */
         if (cluster->top_m_size < cluster_size) {
-                TRACE_TASK(t, "unconditionally adding task to top-m.\n");
+//              TRACE_TASK(t, "unconditionally adding task to top-m.\n");
                 binheap_add(&tsk_rt(t)->budget.top_m_node, &cluster->top_m,
                                         struct budget_tracker, top_m_node);
                 ++cluster->top_m_size;
@@ -233,8 +233,8 @@ static void cedf_track_in_top_m(struct task_struct *t)
                                 rt_param);
 
         if (__edf_higher_prio(t, BASE, mth_highest, BASE)) {
-                TRACE_TASK(t, "adding to top-m (evicting %s/%d)\n",
-                                   mth_highest->comm, mth_highest->pid);
+//              TRACE_TASK(t, "adding to top-m (evicting %s/%d)\n",
+//                                 mth_highest->comm, mth_highest->pid);
 
                 binheap_delete_root(&cluster->top_m, struct budget_tracker, top_m_node);
                 INIT_BINHEAP_NODE(&tsk_rt(mth_highest)->budget.top_m_node);
@@ -250,7 +250,7 @@ static void cedf_track_in_top_m(struct task_struct *t)
                 budget_state_machine(t,on_enter_top_m);
         }
         else {
-                TRACE_TASK(t, "adding to not-top-m\n");
+//              TRACE_TASK(t, "adding to not-top-m\n");
                 binheap_add(&tsk_rt(t)->budget.top_m_node,
                                         &cluster->not_top_m,
                                         struct budget_tracker, top_m_node);
@@ -263,12 +263,12 @@ static void cedf_untrack_in_top_m(struct task_struct *t)
         cedf_domain_t *cluster = task_cpu_cluster(t);
 
         if (!binheap_is_in_heap(&tsk_rt(t)->budget.top_m_node)) {
-                TRACE_TASK(t, "is not being tracked\n"); /* BUG() on this case? */
+//              TRACE_TASK(t, "is not being tracked\n"); /* BUG() on this case? */
                 return;
         }
 
         if (bt_flag_is_set(t, BTF_IS_TOP_M)) {
-                TRACE_TASK(t, "removing task from top-m\n");
+//              TRACE_TASK(t, "removing task from top-m\n");
 
                 /* delete t's entry */
                 binheap_delete(&tsk_rt(t)->budget.top_m_node, &cluster->top_m);
@@ -285,7 +285,7 @@ static void cedf_untrack_in_top_m(struct task_struct *t)
                                                  struct task_struct,
                                                  rt_param);
 
-                        TRACE_TASK(to_move, "being promoted to top-m\n");
+//                      TRACE_TASK(to_move, "being promoted to top-m\n");
 
                         binheap_delete_root(&cluster->not_top_m, struct budget_tracker, top_m_node);
                         INIT_BINHEAP_NODE(&tsk_rt(to_move)->budget.top_m_node);
@@ -301,7 +301,7 @@ static void cedf_untrack_in_top_m(struct task_struct *t)
                 }
         }
         else {
-                TRACE_TASK(t, "removing task from not-top-m\n");
+//              TRACE_TASK(t, "removing task from not-top-m\n");
                 binheap_delete(&tsk_rt(t)->budget.top_m_node, &cluster->not_top_m);
         }
 }
@@ -1800,19 +1800,16 @@ if (current != t) and t is linked (but not scheduled?), do something.
 
 #ifdef CONFIG_REALTIME_AUX_TASKS
         /* make sure we clean up on our way out */
-        if (unlikely(tsk_rt(t)->is_aux_task)) {
+        if (unlikely(tsk_rt(t)->is_aux_task))
                 exit_aux_task(t);
-        }
-        else if(tsk_rt(t)->has_aux_tasks) {
+        else if(tsk_rt(t)->has_aux_tasks)
                 disable_aux_task_owner(t);
-        }
 #endif
 
 #ifdef CONFIG_LITMUS_NVIDIA
         /* make sure we clean up on our way out */
-        if(tsk_rt(t)->held_gpus) {
+        if(tsk_rt(t)->held_gpus)
                 disable_gpu_owner(t);
-        }
 #endif
 
         unlink(t);