5 files changed, 60 insertions, 20 deletions

diff --git a/include/litmus/budget.h b/include/litmus/budget.h
index 2a3511245f7a..72f04777e0b0 100644
--- a/include/litmus/budget.h
+++ b/include/litmus/budget.h
@@ -54,15 +54,17 @@ struct enforcement_timer
 
 typedef void (*scheduled_t)(struct task_struct* t);
 typedef void (*blocked_t)(struct task_struct* t);
-typedef void (*preempt_or_sleep_t)(struct task_struct* t);
-typedef void (*exhausted_t)(struct task_struct* t);
+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);
 
 struct budget_tracker_ops
 {
         scheduled_t                     on_scheduled;   /* called from litmus_schedule(). */
         blocked_t                       on_blocked;             /* called from plugin::schedule() */
-        preempt_or_sleep_t      on_preempt_or_sleep;    /* called from plugin::schedule() */
+        preempt_t                       on_preempt;             /* called from plugin::schedule() */
+        sleep_t                         on_sleep;               /* called from plugin::schedule() */
 
         exit_t                          on_exit;                /* task exiting rt mode */
 
@@ -84,15 +86,30 @@ enum BT_FLAGS
 };
 
 /* Functions for simple DRAIN_SIMPLE policy common
- * to every scheduler. Scheduler must provided
+ * to every scheduler. Scheduler must provide
  * implementation for simple_on_exhausted().
  */
 void simple_on_scheduled(struct task_struct* t);
 void simple_on_blocked(struct task_struct* t);
-void simple_on_preempt_or_sleep(struct task_struct* t);
+void simple_on_preempt(struct task_struct* t);
+void simple_on_sleep(struct task_struct* t);
 void simple_on_exit(struct task_struct* t);
 
 
+/* Functions for DRAIN_SOBLIV policy common
+ * to every scheduler. Scheduler must provide
+ * implementation for sobliv_on_exhausted().
+ *
+ * Limitation: Quantum budget tracking is unsupported.
+ */
+void sobliv_on_scheduled(struct task_struct* t);
+void sobliv_on_blocked(struct task_struct* t);
+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 init_budget_tracker(struct budget_tracker* bt,
                                 const struct budget_tracker_ops* ops);
 
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index f6ea5f6e80ee..ce24e62eee81 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -70,7 +70,11 @@ void litmus_exit_task(struct task_struct *tsk);
 #define get_period(t)           (tsk_rt(t)->task_params.period)
 #define get_release(t)          (tsk_rt(t)->job_params.release)
 #define get_lateness(t)         (tsk_rt(t)->job_params.lateness)
-#define get_budget_timer(t) (tsk_rt(t)->job_params.budget_timer)
+#define get_backlog(t)          (tsk_rt(t)->job_params.backlog)
+
+#define has_backlog(t)          (get_backlog(t) != 0)
+
+#define get_budget_timer(t) (tsk_rt(t)->budget)
 
 #define effective_priority(t) ((!(tsk_rt(t)->inh_task)) ? t : tsk_rt(t)->inh_task)
 #define base_priority(t) (t)
diff --git a/include/litmus/locking.h b/include/litmus/locking.h
index 3ae6692dbe95..962ad5e6726a 100644
--- a/include/litmus/locking.h
+++ b/include/litmus/locking.h
@@ -229,5 +229,13 @@ struct litmus_lock_ops {
 void suspend_for_lock(void);
 int wake_up_for_lock(struct task_struct* t);
 
+/* thread safe?? */
+#ifndef CONFIG_LITMUS_NESTED_LOCKING
+#define holds_locks(tsk) \
+        (tsk_rt(t)->num_locks_held || tsk_rt(t)->num_local_locks_held)
+#else
+#define holds_locks(tsk) \
+        (tsk_rt(t)->num_locks_held || tsk_rt(t)->num_local_locks_held || !binheap_empty(&tsk_rt(t)->hp_blocked_tasks))
 #endif
 
+#endif
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index 887075b908ca..499ecd899fcd 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -257,6 +257,19 @@ struct rt_job {
          * Increase this sequence number when a job is released.
          */
         unsigned int    job_no;
+
+        /* Increments each time a job is forced to complete by
+         * budget exhaustion. If a job completes without remaining
+         * budget, the next job will be early-released _without_
+         * pushing back its deadline. job_backlog is decremented once
+         * per early release. This behavior continues until
+         * backlog == 0.
+         */
+        unsigned int    backlog;
+
+        /* denotes if the current job is a backlogged job that was caused
+         * by an earlier budget exhaustion */
+        unsigned int    is_backlogged_job:1;
 };
 
 struct pfair_param;
@@ -387,6 +400,14 @@ struct rt_param {
         unsigned int            num_local_locks_held;
 #endif
 
+#ifdef CONFIG_LITMUS_NESTED_LOCKING
+        raw_spinlock_t                  hp_blocked_tasks_lock;
+        struct binheap                  hp_blocked_tasks;
+
+        /* pointer to lock upon which is currently blocked */
+        struct litmus_lock* blocked_lock;
+#endif
+
         /* user controlled parameters */
         struct rt_task          task_params;
 
@@ -401,15 +422,6 @@ struct rt_param {
          */
         struct task_struct*     inh_task;
 
-#ifdef CONFIG_LITMUS_NESTED_LOCKING
-        raw_spinlock_t                  hp_blocked_tasks_lock;
-        struct binheap                  hp_blocked_tasks;
-
-        /* pointer to lock upon which is currently blocked */
-        struct litmus_lock* blocked_lock;
-#endif
-
-
 #ifdef CONFIG_REALTIME_AUX_TASKS
         unsigned int            is_aux_task:1;
         unsigned int            aux_ready:1;
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index 0785db39b2fc..9a7e6fa1e6b6 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -52,11 +52,10 @@ struct st_switch_away_data {	/* A process was switched away from on a given CPU.
 
 struct st_completion_data {     /* A job completed. */
         u64     when;
-        u8      forced:1;       /* Set to 1 if job overran and kernel advanced to the
-                                 * next task automatically; set to 0 otherwise.
-                                 */
-        u8      __uflags:7;
-        u8      __unused[7];
+        u64     backlog_remaining:62;
+        u8      was_backlog_job:1;
+        u8      forced:1; /* Set to 1 if job overran and kernel advanced to the
+                           * next task automatically; set to 0 otherwise. */
 } __attribute__((packed));
 
 struct st_block_data {          /* A task blocks. */