work in progress.

9 files changed, 156 insertions, 31 deletions

diff --git a/include/litmus/bheap.h b/include/litmus/bheap.h
index cf4864a498d8..49f7e44bc0a5 100644
--- a/include/litmus/bheap.h
+++ b/include/litmus/bheap.h
@@ -24,6 +24,8 @@ struct bheap {
          * This speeds up repeated peek operations.
          */
         struct bheap_node*      min;
+
+//      unsigned int            size;
 };
 
 typedef int (*bheap_prio_t)(struct bheap_node* a, struct bheap_node* b);
@@ -41,6 +43,11 @@ static inline int bheap_empty(struct bheap* heap)
         return heap->head == NULL && heap->min == NULL;
 }
 
+//static inline unsigned int bheap_size(struct bheap* heap)
+//{
+//      return heap->size;
+//}
+
 /* insert (and reinitialize) a node into the heap */
 void bheap_insert(bheap_prio_t higher_prio,
                  struct bheap* heap,
diff --git a/include/litmus/budget.h b/include/litmus/budget.h
index 72f04777e0b0..4f1bdd101a9e 100644
--- a/include/litmus/budget.h
+++ b/include/litmus/budget.h
@@ -58,6 +58,8 @@ typedef void (*preempt_t)(struct task_struct* t);
 typedef void (*sleep_t)(struct task_struct* t);
 typedef enum hrtimer_restart (*exhausted_t)(struct task_struct* t);
 typedef void (*exit_t)(struct task_struct* t);
+typedef void (*inherit_t)(struct task_struct* t, struct task_struct* prio_inh);
+typedef void (*disinherit_t)(struct task_struct* t, struct task_struct* prio_inh);
 
 struct budget_tracker_ops
 {
@@ -69,6 +71,9 @@ struct budget_tracker_ops
         exit_t                          on_exit;                /* task exiting rt mode */
 
         exhausted_t                     on_exhausted;   /* called by plugin::tick() or timer interrupt */
+
+        inherit_t                       on_inherit;
+        disinherit_t            on_disinherit;
 };
 
 struct budget_tracker
@@ -108,6 +113,8 @@ void sobliv_on_sleep(struct task_struct* t);
 /* Use the DRAIN_SIMPLE implementations */
 #define sobliv_on_preempt       simple_on_preempt
 #define sobliv_on_exit  simple_on_exit
+void sobliv_on_inherit(struct task_struct* t, struct task_struct* prio_inh);
+void sobliv_on_disinherit(struct task_struct* t, struct task_struct* prio_inh);
 
 
 void init_budget_tracker(struct budget_tracker* bt,
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 499ecd899fcd..40bdb26faebe 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -422,6 +422,8 @@ struct rt_param {
          */
         struct task_struct*     inh_task;
 
+        struct task_struct*     inh_task_linkback;
+
 #ifdef CONFIG_REALTIME_AUX_TASKS
         unsigned int            is_aux_task:1;
         unsigned int            aux_ready:1;
diff --git a/litmus/bheap.c b/litmus/bheap.c
index 528af97f18a6..45e1db36fa36 100644
--- a/litmus/bheap.c
+++ b/litmus/bheap.c
@@ -5,6 +5,8 @@ void bheap_init(struct bheap* heap)
 {
         heap->head = NULL;
         heap->min  = NULL;
+
+//      heap->size = 0;
 }
 
 void bheap_node_init(struct bheap_node** _h, void* value)
@@ -173,6 +175,8 @@ void bheap_insert(bheap_prio_t higher_prio, struct bheap* heap,
                 heap->min   = node;
         } else
                 __bheap_union(higher_prio, heap, node);
+
+//      ++heap->size;
 }
 
 void bheap_uncache_min(bheap_prio_t higher_prio, struct bheap* heap)
@@ -195,6 +199,8 @@ void bheap_union(bheap_prio_t higher_prio,
         __bheap_union(higher_prio, target, addition->head);
         /* this is a destructive merge */
         addition->head = NULL;
+
+//      target->size += addition->size;
 }
 
 struct bheap_node* bheap_peek(bheap_prio_t higher_prio,
@@ -215,6 +221,9 @@ struct bheap_node* bheap_take(bheap_prio_t higher_prio,
         heap->min = NULL;
         if (node)
                 node->degree = NOT_IN_HEAP;
+
+//      --heap->size;
+
         return node;
 }
 
@@ -286,7 +295,10 @@ void bheap_delete(bheap_prio_t higher_prio, struct bheap* heap,
                 __bheap_union(higher_prio, heap, __bheap_reverse(node->child));
         } else
                 heap->min = NULL;
+
         node->degree = NOT_IN_HEAP;
+
+//      --heap->size;
 }
 
 /* allocate a heap node for value and insert into the heap */
diff --git a/litmus/budget.c b/litmus/budget.c
index 15de83bc584e..91755cf2787c 100644
--- a/litmus/budget.c
+++ b/litmus/budget.c
@@ -171,6 +171,11 @@ void sobliv_on_scheduled(struct task_struct* t)
                         arm_enforcement_timer(t);
                 }
         }
+
+        if (tsk_rt(t)->inh_task) {
+                BUG_ON(is_running(tsk_rt(t)->inh_task));
+                tsk_rt(tsk_rt(t)->inh_task)->inh_task_linkback = t;
+        }
 }
 
 void sobliv_on_blocked(struct task_struct* t)
@@ -196,6 +201,25 @@ void sobliv_on_sleep(struct task_struct* t)
         }
 }
 
+void sobliv_on_inherit(struct task_struct* t, struct task_struct* prio_inh)
+{
+        BUG_ON(!prio_inh);
+
+        if (budget_precisely_tracked(t)) {
+                TRACE_TASK(t, "inheriting from %s/%d. stop draining own budget.\n",
+                                   prio_inh->comm, prio_inh->pid);
+                cancel_enforcement_timer(t);
+        }
+}
+
+void sobliv_on_disinherit(struct task_struct* t, struct task_struct* prio_inh)
+{
+        if (!prio_inh && budget_precisely_tracked(t)) {
+                TRACE_TASK(t, "assuming base priority. start draining own budget.\n");
+                arm_enforcement_timer(t);
+        }
+}
+
 
 static enum hrtimer_restart __on_timeout(struct hrtimer *timer)
 {
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index fd1b80ac6090..64e04405dd32 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -440,6 +440,7 @@ static noinline void job_completion(struct task_struct *t, int forced)