1 files changed, 80 insertions, 26 deletions

diff --git a/include/litmus/budget.h b/include/litmus/budget.h
index 763b31c0e9f6..2a3511245f7a 100644
--- a/include/litmus/budget.h
+++ b/include/litmus/budget.h
@@ -1,26 +1,14 @@
 #ifndef _LITMUS_BUDGET_H_
 #define _LITMUS_BUDGET_H_
 
-/* Update the per-processor enforcement timer (arm/reproram/cancel) for
- * the next task. */
-void update_enforcement_timer(struct task_struct* t);
+#include <linux/hrtimer.h>
+#include <linux/semaphore.h>
 
-/* Send SIG_BUDGET to a real-time task. */
-void send_sigbudget(struct task_struct* t);
+#define budget_exhausted(t) \
+        (get_exec_time(t) >= get_exec_cost(t))
 
-inline static int budget_exhausted(struct task_struct* t)
-{
-        return get_exec_time(t) >= get_exec_cost(t);
-}
-
-inline static lt_t budget_remaining(struct task_struct* t)
-{
-        if (!budget_exhausted(t))
-                return get_exec_cost(t) - get_exec_time(t);
-        else
-                /* avoid overflow */
-                return 0;
-}
+#define budget_remaining(t) \
+        ((!budget_exhausted(t)) ? (get_exec_cost(t) - get_exec_time(t)) : 0)
 
 #define budget_enforced(t) (\
         tsk_rt(t)->task_params.budget_policy != NO_ENFORCEMENT)
@@ -29,21 +17,87 @@ inline static lt_t budget_remaining(struct task_struct* t)
         tsk_rt(t)->task_params.budget_policy == PRECISE_ENFORCEMENT || \
         tsk_rt(t)->task_params.budget_signal_policy == PRECISE_SIGNALS)
 
+#define budget_quantum_tracked(t) (\
+        tsk_rt(t)->task_params.budget_policy == QUANTUM_ENFORCEMENT || \
+        tsk_rt(t)->task_params.budget_signal_policy == QUANTUM_SIGNALS)
+
 #define budget_signalled(t) (\
         tsk_rt(t)->task_params.budget_signal_policy != NO_SIGNALS)
 
 #define budget_precisely_signalled(t) (\
         tsk_rt(t)->task_params.budget_policy == PRECISE_SIGNALS)
 
-#define sigbudget_sent(t) (\
-        test_bit(RT_JOB_SIG_BUDGET_SENT, &tsk_rt(t)->job_params.flags))
+#define bt_flag_is_set(t, flag_nr) (\
+        test_bit(flag_nr, &tsk_rt(t)->budget.flags))
+
+#define bt_flag_test_and_set(t, flag_nr) (\
+        test_and_set_bit(flag_nr, &tsk_rt(t)->budget.flags))
+
+#define bt_flag_set(t, flag_nr) (\
+        set_bit(flag_nr, &tsk_rt(t)->budget.flags))
+
+#define bt_flag_clear(t, flag_nr) (\
+        clear_bit(flag_nr, &tsk_rt(t)->budget.flags))
+
+#define bt_flags_reset(t) (\
+        tsk_rt(t)->budget.flags = 0)
+
+#define requeue_preempted_job(t) \
+        (t && (!budget_exhausted(t) || !budget_enforced(t)))
+
+struct enforcement_timer
+{
+        raw_spinlock_t lock;
+        struct hrtimer timer;
+        int armed:1;
+};
+
+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 (*exit_t)(struct task_struct* t);
 
-static inline int requeue_preempted_job(struct task_struct* t)
+struct budget_tracker_ops
 {
-        /* Add task to ready queue only if not subject to budget enforcement or
-         * if the job has budget remaining. t may be NULL.
-         */
-        return t && (!budget_exhausted(t) || !budget_enforced(t));
-}
+        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() */
+
+        exit_t                          on_exit;                /* task exiting rt mode */
+
+        exhausted_t                     on_exhausted;   /* called by plugin::tick() or timer interrupt */
+};
+
+struct budget_tracker
+{
+        struct enforcement_timer timer;
+        const struct budget_tracker_ops* ops;
+        unsigned long flags;
+};
+
+/* budget tracker flags */
+enum BT_FLAGS
+{
+        BTF_BUDGET_EXHAUSTED = 0,
+        BTF_SIG_BUDGET_SENT     = 1,
+};
+
+/* Functions for simple DRAIN_SIMPLE policy common
+ * to every scheduler. Scheduler must provided
+ * 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_exit(struct task_struct* t);
+
+
+void init_budget_tracker(struct budget_tracker* bt,
+                                const struct budget_tracker_ops* ops);
+
+
+/* Send SIG_BUDGET to a real-time task. */
+void send_sigbudget(struct task_struct* t);
 
 #endif