3 files changed, 32 insertions, 23 deletions

diff --git a/include/litmus/fpmath.h b/include/litmus/fpmath.h
index 0ad1927e2261..9564d4529387 100644
--- a/include/litmus/fpmath.h
+++ b/include/litmus/fpmath.h
@@ -1,14 +1,30 @@
 #ifndef __FP_MATH_H__
 #define __FP_MATH_H__
 
+#include <litmus/rt_param.h>
+
 #define FP_SHIFT 10
 #define ROUND_BIT (FP_SHIFT - 1)
 #define ONE FP(1)
 
 #define _fp(x) ((fp_t) {x})
 
-static const fp_t FP_ZERO = {.val = 0};
-static const fp_t FP_ONE = {.val = (1 << FP_SHIFT)};
+
+static const fp_t LITMUS_FP_ZERO = {.val = 0};
+static const fp_t LITMUS_FP_ONE = {.val = (1 << FP_SHIFT)};
+
+static inline fp_t FP(fpbuf_t x)
+{
+        return _fp(((fpbuf_t) x) << FP_SHIFT);
+}
+
+/* divide two integers to obtain a fixed point value  */
+static inline fp_t _frac(fpbuf_t a, fpbuf_t b)
+{
+        return _fp(FP(a).val / (b));
+}
+
+#ifdef __KERNEL__
 
 static inline fpbuf_t _point(fp_t x) 
 {       
@@ -20,11 +36,6 @@ static inline fpbuf_t _point(fp_t x)
 /*(x.val >> FP_SHIFT), (x.val % (1 << FP_SHIFT)) */
 #define _FP_  "%ld/1024"
 
-static inline fp_t FP(fpbuf_t x)
-{
-        return _fp(((fpbuf_t) x) << FP_SHIFT);
-}
-
 static inline fpbuf_t _floor(fp_t x)
 {
         return x.val >> FP_SHIFT;
@@ -36,12 +47,6 @@ static inline fpbuf_t _round(fp_t x)
         return _floor(x) + ((x.val >> ROUND_BIT) & 1);
 }       
 
-/* divide two integers to obtain a fixed point value  */
-static inline fp_t _frac(fpbuf_t a, fpbuf_t b)
-{
-        return _fp(FP(a).val / (b));
-}
-
 /* multiply two fixed point values */
 static inline fp_t _mul(fp_t a, fp_t b)
 {       
@@ -77,10 +82,10 @@ static inline fp_t _abs(fp_t x)
         return _fp(abs(x.val));
 }
 
-/* equiv. to casting float/double to integer */
+/* works the same as casting float/double to integer */
 static inline fpbuf_t _fp_to_integer(fp_t x)
 {
-        return _floor(_abs(x)) * ((x.val > 0) ? 1 : -1);        
+        return _floor(_abs(x)) * ((x.val > 0) ? 1 : -1);
 }
 
 static inline fp_t _integer_to_fp(fpbuf_t x)
@@ -120,5 +125,5 @@ static inline fp_t _max(fp_t a, fp_t b)
         else
                 return a;
 }
-
+#endif
 #endif
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 95125d23c458..1d50efa2aee3 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -102,6 +102,9 @@ inline static lt_t budget_remaining(struct task_struct* t)
 #define set_zerolaxity(t,s) (tsk_rt(t)->job_params.zero_laxity=(s))
 
 #ifdef CONFIG_PLUGIN_AEDZL
+#define get_feedback_a(t)               (tsk_rt(t)->task_params.a)
+#define get_feedback_b(t)               (tsk_rt(t)->task_params.b)
+
 inline static lt_t get_exec_cost_est(struct task_struct* t)
 {
         return (lt_t)( /* express cost in terms of lt_t */
@@ -109,7 +112,7 @@ inline static lt_t get_exec_cost_est(struct task_struct* t)
                                                 assume fraction is not negative and take abs()*/
                                         _fp_to_integer( /* truncate off fractional part */
                                                         _mul( /* exe = util * period */
-                                                                        tsk_rt(t)->task_params.util_est, _frac(get_rt_period(t), 1)
+                                                                        tsk_rt(t)->zl_util_est, _frac(get_rt_period(t), 1)
                                                                 )
                                                         )
                                         )
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index d1a1f6ab523a..d2ef9ed02349 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -33,13 +33,11 @@ typedef enum {
         PRECISE_ENFORCEMENT  /* NOT IMPLEMENTED - enforced with hrtimers */
 } budget_policy_t;
 
-#ifdef CONFIG_PLUGIN_AEDZL
 typedef long fpbuf_t;
 typedef struct
 {
         fpbuf_t val;
 } fp_t;
-#endif
 
 struct rt_task {
         lt_t            exec_cost;
@@ -49,10 +47,9 @@ struct rt_task {
         task_class_t    cls;
         budget_policy_t budget_policy; /* ignored by pfair */
 
-#ifdef CONFIG_PLUGIN_AEDZL
-        fp_t            util_est;
-        fp_t            accum_err;
-#endif
+        /* AEDZL - feedback control parameters set by user */
+        fp_t            a;
+        fp_t            b;
 };
 
 /* The definition of the data that is shared between the kernel and real-time
@@ -139,6 +136,10 @@ struct rt_param {
         unsigned int            zl_timer_armed:1;
         /* used to trigger zero-laxity detection */
         struct hrtimer          zl_timer;
+#ifdef CONFIG_PLUGIN_AEDZL
+        fp_t                            zl_util_est;
+        fp_t                            zl_accum_err;
+#endif
 #endif
 
         /* task representing the current "inherited" task