EDF-WM: add tracing info and BUG_ON() checks

To aid with debugging.

1 files changed, 15 insertions, 2 deletions

diff --git a/litmus/sched_edf_wm.c b/litmus/sched_edf_wm.c
index f7a2fccd55a5..e25977a91c8b 100644
--- a/litmus/sched_edf_wm.c
+++ b/litmus/sched_edf_wm.c
@@ -103,6 +103,11 @@ static void advance_next_slice(struct task_struct* t, int completion_signaled)
         idx = p->semi_part.wm.slice -
                 p->task_params.semi_part.wm.slices;
 
+        TRACE_TASK(t, "advancing slice %d; excess=%lluns; "
+                   "completion_signaled=%d.\n",
+                   idx, slice_exec_time(t) - slice_budget(t),
+                   completion_signaled);
+
         if (completion_signaled)
                 idx = 0;
         else
@@ -160,8 +165,11 @@ static void fast_forward_slices(struct task_struct* t, lt_t time_passed)
                 time_passed -= slice_budget_remaining(t);
                 tsk_rt(t)->job_params.exec_time +=
                         slice_budget_remaining(t);
+
                 BUG_ON(!slice_budget_exhausted(t));
                 BUG_ON(slice_budget_remaining(t) != 0);
+                BUG_ON(tsk_rt(t)->semi_part.wm.slice == get_last_slice(t));
+
                 advance_next_slice(t, 0);
         }
         /* add remainder to exec cost */
@@ -357,7 +365,8 @@ static struct task_struct* wm_schedule(struct task_struct * prev)
                         next = prev;
 
         if (next) {
-                TRACE_TASK(next, "scheduled at %llu\n", litmus_clock());
+                TRACE_TASK(next, "scheduled at %llu (state:%d/%d)\n", litmus_clock(),
+                           next->state, is_running(next));
                 set_rt_flags(next, RT_F_RUNNING);
         } else if (exists) {
                 TRACE("becoming idle at %llu\n", litmus_clock());
@@ -462,16 +471,20 @@ static void wm_task_wake_up(struct task_struct *t)
 
         sleep_time = now - p->semi_part.wm.suspend_time;
 
-        TRACE_TASK(t, "wake_up at %llu after %llu\n", now, sleep_time);
+        TRACE_TASK(t, "wake_up at %llu after %llu, still-scheduled:%d\n",
+                   now, sleep_time, dom->scheduled == t);
 
         /* account sleep time as execution time */
         if (get_exec_time(t) + sleep_time >= get_exec_cost(t)) {
                 /* new sporadic release */
+                TRACE_TASK(t, "new sporadic release\n");
                 wm_release_at(t, wm_earliest_release(t, now));
                 sched_trace_task_release(t);
         } else if (is_sliced_task(t)) {
                 /* figure out which slice we should be executing on */
                 fast_forward_slices(t, sleep_time);
+                /* can't be exhausted now */
+                BUG_ON(wm_budget_exhausted(t));
         } else {
                 /* simply add to the execution time */
                 tsk_rt(t)->job_params.exec_time += sleep_time;