paranoid android

1 files changed, 28 insertions, 7 deletions

diff --git a/litmus/rt_domain.c b/litmus/rt_domain.c
index 09123eeadf2c..5264d2546a7f 100644
--- a/litmus/rt_domain.c
+++ b/litmus/rt_domain.c
@@ -254,7 +254,7 @@ static void setup_release(rt_domain_t *_rt)
         list_for_each_safe(pos, safe, &list) {
                 /* pick task of work list */
                 t = list_entry(pos, struct task_struct, rt_param.list);
-                sched_trace_task_release(t);
+                /* sched_trace_task_release(t); */
                 list_del_init(pos);
 
                 /* put into release heap while holding release_lock */
@@ -410,14 +410,21 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
         BUG_ON(is_queued(task));
         BUG_ON(get_task_domain(task) != dom);
 
+        if (is_queued(task)) {
+                VTRACE_TASK(task, "Queued, skipping\n");
+                return;
+        }
+
         if (is_released(task, litmus_clock())) {
                 __add_ready(domain, task);
-                VTRACE("rt: adding %s/%d (%llu, %llu) rel=%llu to ready queue at %llu\n",
+                /* tsk_rt(task)->go = 1; */
+                VTRACE("going, rt: adding %s/%d (%llu, %llu) rel=%llu to ready queue at %llu\n",
                       task->comm, task->pid, get_exec_cost(task), get_rt_period(task),
                       get_release(task), litmus_clock());
         } else {
                 /* task has to wait for next release */
-                VTRACE_TASK(task, "add release(), rel=%llu\n", get_release(task));
+                VTRACE_TASK(task, "not going, add release(), rel=%llu\n", get_release(task));
+                /* tsk_rt(task)->go = 0; */
                 add_release(domain, task);
         }
 
@@ -429,7 +436,12 @@ static void pd_requeue(domain_t *dom, struct task_struct *task)
  */
 static struct task_struct* pd_take_ready(domain_t *dom)
 {
-        return __take_ready((rt_domain_t*)dom->data);
+        struct task_struct *t = __take_ready((rt_domain_t*)dom->data);
+        if (t) {
+                /* TRACE_TASK(t, "going\n"); */
+                /* tsk_rt(t)->go = 1; */
+        }
+        return t;
 }
 
 /* pd_peek_ready - returns the head of the rt_domain ready queue
@@ -438,14 +450,23 @@ static struct task_struct* pd_take_ready(domain_t *dom)
  */
 static struct task_struct* pd_peek_ready(domain_t *dom)
 {
-        return __next_ready((rt_domain_t*)dom->data);
+        struct task_struct *t = __peek_ready((rt_domain_t*)dom->data);
+        /* if (t) { */
+        /*      TRACE_TASK(t, "going\n"); */
+        /*      tsk_rt(t)->go = 1; */
+        /* } */
+        return t;
 }
 
 static void pd_remove(domain_t *dom, struct task_struct *task)
 {
-        if (is_queued(task)) {
+        if (is_queued(task))
                 remove((rt_domain_t*)dom->data, task);
-        }
+        /* if (is_queued(task) && tsk_rt(task)->go) { */
+        /*      remove((rt_domain_t*)dom->data, task); */
+        /* } else if (is_queued(task)) { */
+        /*      VTRACE_TASK(task, "Did not remove cause of nogo\n"); */
+        /* } */
 }
 
 /* pd_domain_init - create a generic domain wrapper for an rt_domain