Improve debugging output and support

- TRACE jobs being queued
- TRACE enter_np/exit_np
- fix double assignment of F in sysrq handlers

2 files changed, 9 insertions, 3 deletions

diff --git a/kernel/edf_common.c b/kernel/edf_common.c
index 00e964925c..88937c645b 100644
--- a/kernel/edf_common.c
+++ b/kernel/edf_common.c
@@ -88,6 +88,8 @@ void __add_ready(edf_domain_t* edf, struct task_struct *new)
         unsigned int passed = 0;
 
         BUG_ON(!new);
+        TRACE("edf: adding %s/%d to ready queue\n", new->comm, new->pid);
+
         /* find a spot where our deadline is earlier than the next */
         list_for_each(pos, &edf->ready_queue) {         
                 queued = list_entry(pos, struct task_struct, rt_list);
@@ -140,7 +142,7 @@ void __add_release(edf_domain_t* edf, struct task_struct *task)
 
         BUG_ON(!task);
         /* first we need the lock for edf_release_queue */      
-        TRACE("ADDING release %d\n", task->pid);
+        TRACE("edf: adding %s/%d to release queue\n", task->comm, task->pid);
 
         /* find a spot where our deadline is earlier than the next */
         list_for_each_prev(pos, &edf->release_queue) {          
diff --git a/kernel/litmus.c b/kernel/litmus.c
index a93f99bfce..2483e929ab 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -236,6 +236,8 @@ asmlinkage long sys_enter_np(void)
         /* Let the plugin decide. The default callback will return -EPERM.
          */
         retval = curr_sched_plugin->enter_np(current);
+        TRACE("enter_np(%s/%d) => %d and np=%d\n", 
+              current->comm,  current->pid, retval, is_np(current));
       out:
         return retval;
 }
@@ -256,6 +258,8 @@ asmlinkage long sys_exit_np(void)
         /* Let the plugin decide. The default callback will return -EPERM.
          */
         retval = curr_sched_plugin->exit_np(current);
+        TRACE("exit_np(%s/%d) => %d and np=%d\n", 
+              current->comm, current->pid, retval, is_np(current));
       out:
         return retval;
 }
@@ -360,7 +364,7 @@ static void sysrq_handle_kill_rt_tasks(int key, struct tty_struct *tty)
 
 static struct sysrq_key_op sysrq_kill_rt_tasks_op = {
         .handler        = sysrq_handle_kill_rt_tasks,
-        .help_msg       = "f:kill-rt-tasks",
+        .help_msg       = "Quit-rt-tasks",
         .action_msg     = "sent SIGKILL to all real-time tasks",
 };
 #endif
@@ -491,7 +495,7 @@ out:
                 printk("Registered eXit real-time mode magic sysrq.\n");
         else
                 printk("Could not register eXit real-time mode magic sysrq.\n");
-        if (!register_sysrq_key('f', &sysrq_kill_rt_tasks_op)) 
+        if (!register_sysrq_key('q', &sysrq_kill_rt_tasks_op)) 
                 printk("Registered kill rt tasks magic sysrq.\n");
         else
                 printk("Could not register kill rt tasks magic sysrq.\n");