Move budget-related helpers to budget.h

litmus.h is accumulating too many things. Since
we already have budget.h, let's stick all budget-related
inline functions there as well.

This patch is merely cosmetic; it does not change
how budget enforcement works.

6 files changed, 24 insertions, 19 deletions

diff --git a/include/litmus/budget.h b/include/litmus/budget.h
index 732530e6349..96da960adcc 100644
--- a/include/litmus/budget.h
+++ b/include/litmus/budget.h
@@ -5,4 +5,23 @@
  * the next task. */
 void update_enforcement_timer(struct task_struct* 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_enforced(t) (tsk_rt(t)->task_params.budget_policy != NO_ENFORCEMENT)
+
+#define budget_precisely_enforced(t) (tsk_rt(t)->task_params.budget_policy \
+                                      == PRECISE_ENFORCEMENT)
+
 #endif
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 0b071fd359f..160119abfe3 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -59,25 +59,6 @@ void litmus_exit_task(struct task_struct *tsk);
 #define is_priority_boosted(t)  (tsk_rt(t)->priority_boosted)
 #define get_boost_start(t)      (tsk_rt(t)->boost_start_time)
 
-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_enforced(t) (tsk_rt(t)->task_params.budget_policy != NO_ENFORCEMENT)
-
-#define budget_precisely_enforced(t) (tsk_rt(t)->task_params.budget_policy \
-                                      == PRECISE_ENFORCEMENT)
-
 #define is_hrt(t)               \
         (tsk_rt(t)->task_params.cls == RT_CLASS_HARD)
 #define is_srt(t)               \
diff --git a/litmus/budget.c b/litmus/budget.c
index 310e9a3d417..f7712be29ad 100644
--- a/litmus/budget.c
+++ b/litmus/budget.c
@@ -5,6 +5,8 @@
 #include <litmus/litmus.h>
 #include <litmus/preempt.h>
 
+#include <litmus/budget.h>
+
 struct enforcement_timer {
         /* The enforcement timer is used to accurately police
          * slice budgets. */
diff --git a/litmus/sched_cedf.c b/litmus/sched_cedf.c
index 480c62bc895..caf7c52d2b8 100644
--- a/litmus/sched_cedf.c
+++ b/litmus/sched_cedf.c
@@ -35,6 +35,7 @@
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 #include <litmus/preempt.h>
+#include <litmus/budget.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/edf_common.h>
 #include <litmus/sched_trace.h>
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index 6ed504f4750..ea96a48b418 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -21,6 +21,7 @@
 #include <litmus/trace.h>
 
 #include <litmus/preempt.h>
+#include <litmus/budget.h>
 
 #include <litmus/bheap.h>
 
diff --git a/litmus/sched_psn_edf.c b/litmus/sched_psn_edf.c
index 8e4a22dd8d6..b0c8126bd44 100644
--- a/litmus/sched_psn_edf.c
+++ b/litmus/sched_psn_edf.c
@@ -17,6 +17,7 @@
 #include <litmus/litmus.h>
 #include <litmus/jobs.h>
 #include <litmus/preempt.h>
+#include <litmus/budget.h>
 #include <litmus/sched_plugin.h>
 #include <litmus/edf_common.h>
 #include <litmus/sched_trace.h>