disable proclock, fix bk logging, fix decr prio

4 files changed, 21 insertions, 18 deletions

diff --git a/litmus/fifo_lock.c b/litmus/fifo_lock.c
index 745472c30dfd..4598cddbdb79 100644
--- a/litmus/fifo_lock.c
+++ b/litmus/fifo_lock.c
@@ -961,7 +961,7 @@ struct litmus_lock* fifo_mutex_new(struct litmus_lock_ops* ops)
 
         ((struct litmus_lock*)mutex)->nest.hp_waiter_ptr = &mutex->hp_waiter;
 
-        ((struct litmus_lock*)mutex)->proc = &fifo_proc_ops;
+//      ((struct litmus_lock*)mutex)->proc = &fifo_proc_ops;
 
         return &mutex->litmus_lock;
 }
diff --git a/litmus/ikglp_lock.c b/litmus/ikglp_lock.c
index fb0080352a9f..c11152c05efb 100644
--- a/litmus/ikglp_lock.c
+++ b/litmus/ikglp_lock.c
@@ -2248,7 +2248,7 @@ struct litmus_lock* ikglp_new(unsigned int m,
         }
 
         sem->litmus_lock.ops = ops;
-        sem->litmus_lock.proc = &ikglp_proc_ops;
+//      sem->litmus_lock.proc = &ikglp_proc_ops;
 
 #ifdef CONFIG_DEBUG_SPINLOCK
         {
diff --git a/litmus/prioq_lock.c b/litmus/prioq_lock.c
index 4fcb131a52ec..61682d20da51 100644
--- a/litmus/prioq_lock.c
+++ b/litmus/prioq_lock.c
@@ -1538,7 +1538,7 @@ struct litmus_lock* prioq_mutex_new(struct litmus_lock_ops* ops)
 
         ((struct litmus_lock*)mutex)->nest.hp_waiter_ptr = &mutex->hp_waiter;
 
-        ((struct litmus_lock*)mutex)->proc = &prioq_proc_ops;
+//      ((struct litmus_lock*)mutex)->proc = &prioq_proc_ops;
 
         return &mutex->litmus_lock;
 }
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index c4df3778c6a2..a42c06c0ad14 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -599,6 +599,10 @@ static noinline void job_completion(struct task_struct *t, int forced)
                 }
                 else {
                         /* budget was exhausted - force early release */
+                        if (get_backlog(t) == 0) {
+                                TRACE_TASK(t, "first late job\n");
+                                ++get_backlog(t);
+                        }
                         ++get_backlog(t);
                         TRACE_TASK(t, "adding backlogged job\n");
                 }
@@ -608,19 +612,16 @@ static noinline void job_completion(struct task_struct *t, int forced)
                                    get_backlog(t));
         }
 
-
-
         /* SETUP FOR THE NEXT JOB */
 
         sched_trace_task_completion(t, forced);
 
-        TRACE_TASK(t, "job_completion() at %llu (forced = %d).\n",
-                           now, forced);
+        TRACE_TASK(t, "job_completion() at %llu (forced = %d).\n", now, forced);
 
         /* set flags */
         tsk_rt(t)->completed = 0;
 
-        if (!forced && do_backlogged_job) {
+        if (unlikely(!forced && do_backlogged_job)) {
                 /* Don't advance deadline/refresh budget. Use the remaining budget for
                  * the backlogged job.
                  *
@@ -632,16 +633,16 @@ static noinline void job_completion(struct task_struct *t, int forced)
                 cedf_untrack_in_top_m(t);
                 prepare_for_next_period(t);
 
+                do_release = (is_early_releasing(t) || is_released(t, now));
+
                 if (do_backlogged_job) {
                         TRACE_TASK(t, "refreshing budget with early "
                                            "release for backlogged job.\n");
                 }
-        }
-
-        do_release = (is_early_releasing(t) || is_released(t, now));
-        if (do_release) {
-                /* log here to capture overheads */
-                sched_trace_task_release(t);
+                if (do_release || do_backlogged_job) {
+                        /* log here to capture overheads */
+                        sched_trace_task_release(t);
+                }
         }
 
         unlink(t);
@@ -2226,11 +2227,13 @@ static int __decrease_priority_inheritance(struct task_struct* t,
                         if (is_queued(t)) {
                                 TRACE_TASK(t, "is queued.\n");
 
+                                BUG_ON(
+                                        !is_released(t, litmus_clock()) &&
+                                        !tsk_rt(t)->job_params.is_backlogged_job &&
+                                        !is_early_releasing(t));
+
                                 unlink(t);
-                                if (is_released(t, litmus_clock()))
-                                        cedf_job_arrival(t);
-                                else
-                                        add_release(&cluster->domain, t);
+                                cedf_job_arrival(t);
                         }
                         else {
                                 TRACE_TASK(t, "is not in scheduler. Probably on wait queue somewhere.\n");