DBG: enable additional debug tracing

3 files changed, 26 insertions, 10 deletions

diff --git a/kernel/sched.c b/kernel/sched.c
index 1b13c8e1cfc2..e4cfd193e76b 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -79,6 +79,7 @@
 #include "sched_cpupri.h"
 #include "workqueue_sched.h"
 
+#include <litmus/debug_trace.h>
 #include <litmus/sched_trace.h>
 #include <litmus/trace.h>
 
@@ -583,8 +584,11 @@ void check_preempt_curr(struct rq *rq, struct task_struct *p, int flags)
          * cases. LITMUS^RT amplifies the effects of this problem. Hence, we
          * turn it off to avoid stalling clocks. */
         /*
-        if (test_tsk_need_resched(p))
+        if (test_tsk_need_resched(p)) {
                 rq->skip_clock_update = 1;
+                TRACE_TASK(p, "rq->skip_clock_update <- 1 (flags=%x; cpu=%d; is-cur?=%d)\n",
+                           flags, rq->cpu, rq->curr == p);
+        }
         */
 }
 
@@ -3744,6 +3748,8 @@ static void put_prev_task(struct rq *rq, struct task_struct *prev)
 {
         if (prev->se.on_rq)
                 update_rq_clock(rq);
+        if (rq->skip_clock_update)
+                TRACE_TASK(prev, "rq->skip_clock_update <- 0 (cpu: %d)\n", rq->cpu);
         rq->skip_clock_update = 0;
         prev->sched_class->put_prev_task(rq, prev);
 }
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index e9c5e531b1ae..44cafbadfa28 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -112,9 +112,9 @@ static rt_domain_t gsnedf;
 
 
 /* Uncomment this if you want to see all scheduling decisions in the
- * TRACE() log.
+ * TRACE() log. */
 #define WANT_ALL_SCHED_EVENTS
- */
+
 
 static int cpu_lower_prio(struct bheap_node *_a, struct bheap_node *_b)
 {
@@ -197,8 +197,9 @@ static noinline void link_task_to_cpu(struct task_struct* linked,
 #ifdef WANT_ALL_SCHED_EVENTS
         if (linked)
                 TRACE_TASK(linked, "linked to %d.\n", entry->cpu);
-        else
+/*      else
                 TRACE("NULL linked to %d.\n", entry->cpu);
+*/
 #endif
         update_cpu_position(entry);
 }
@@ -300,7 +301,7 @@ static noinline void job_completion(struct task_struct *t, int forced)
 
         sched_trace_task_completion(t, forced);
 
-        TRACE_TASK(t, "job_completion().\n");
+        TRACE_TASK(t, "job_completion(%u).\n", tsk_rt(t)->job_params.job_no);
 
         /* set flags */
         set_rt_flags(t, RT_F_SLEEP);
@@ -324,6 +325,9 @@ static noinline void job_completion(struct task_struct *t, int forced)
  */
 static void gsnedf_tick(struct task_struct* t)
 {
+        if (is_realtime(t))
+                TRACE_TASK(t, "exec_time = %llu\n", get_exec_time(t));
+
         if (is_realtime(t) && budget_enforced(t) && budget_exhausted(t)) {
                 if (!is_np(t)) {
                         /* np tasks will be preempted when they become
@@ -395,7 +399,9 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
         preempt     = entry->scheduled != entry->linked;
 
 #ifdef WANT_ALL_SCHED_EVENTS
-        TRACE_TASK(prev, "invoked gsnedf_schedule.\n");
+        if (exists || entry->linked)
+                TRACE_TASK(prev, "invoked gsnedf_schedule at %llu\n",
+                           litmus_clock());
 #endif
 
         if (exists)
@@ -464,15 +470,12 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
         raw_spin_unlock(&gsnedf_lock);
 
 #ifdef WANT_ALL_SCHED_EVENTS
-        TRACE("gsnedf_lock released, next=0x%p\n", next);
-
         if (next)
                 TRACE_TASK(next, "scheduled at %llu\n", litmus_clock());
         else if (exists && !next)
                 TRACE("becomes idle at %llu.\n", litmus_clock());
 #endif
 
-
         return next;
 }
 
@@ -485,7 +488,8 @@ static void gsnedf_finish_switch(struct task_struct *prev)
 
         entry->scheduled = is_realtime(current) ? current : NULL;
 #ifdef WANT_ALL_SCHED_EVENTS
-        TRACE_TASK(prev, "switched away from\n");
+        if (is_realtime(prev))
+                TRACE_TASK(prev, "switched away from\n");
 #endif
 }
 
diff --git a/litmus/sched_litmus.c b/litmus/sched_litmus.c
index e6952896dc4b..b61fea15935f 100644
--- a/litmus/sched_litmus.c
+++ b/litmus/sched_litmus.c
@@ -10,6 +10,12 @@ static void update_time_litmus(struct rq *rq, struct task_struct *p)
         u64 delta = rq->clock - p->se.exec_start;
         if (unlikely((s64)delta < 0))
                 delta = 0;
+        if (rq->skip_clock_update)
+                TRACE_TASK(p, "rq->skip_clock_update\n");
+        TRACE_TASK(p, "update_time_litmus: "
+                   "rq->clock=%llu "
+                   "p->se.exec_start=%llu litmus=%llu => delta=%llu\n",
+                   rq->clock, p->se.exec_start, litmus_clock(), delta);
         /* per job counter */
         p->rt_param.job_params.exec_time += delta;
         /* task counter */