adaptive: debugging

2 files changed, 27 insertions, 4 deletions

diff --git a/include/linux/fpmath.h b/include/linux/fpmath.h
index 7489bb8dec..9e97eb6991 100644
--- a/include/linux/fpmath.h
+++ b/include/linux/fpmath.h
@@ -7,9 +7,19 @@
 
 #define _fp(x) ((fp_t) {x})
 
+static inline long _point(fp_t x) 
+{       
+        return (x.val % (1 << FP_SHIFT));
+        
+}       
+
+#define fp2str(x) (x.val / (1 << FP_SHIFT)), (x.val % (1 << FP_SHIFT)) 
+#define _FP_  "%d%+d/1024"
+
+
 static inline fp_t FP(long x)
 {
-        return _fp(((long long) x) << FP_SHIFT);
+        return _fp(((long) x) << FP_SHIFT);
 }
 
 static inline long _floor(fp_t x)
@@ -84,5 +94,9 @@ static inline int _gt(fp_t a, fp_t b)
         return a.val > b.val;
 }
 
+static inline int _eq(fp_t a, fp_t b)
+{
+        return a.val == b.val;
+}
 
 #endif
diff --git a/include/linux/sched_adaptive.h b/include/linux/sched_adaptive.h
index 4e73568e1e..7f8d5da841 100644
--- a/include/linux/sched_adaptive.h
+++ b/include/linux/sched_adaptive.h
@@ -25,6 +25,7 @@ static inline fp_t weight_transfer(fp_t from_val, fp_t to_val,
         fp_t rel_from, rel_to;
         rel_from = _add(intercept, _mul(from_val, slope));
         rel_to   = _add(intercept, _mul(to_val, slope));
+        BUG_ON(_eq(rel_from, FP(0)));
         return _div(_mul(act_weight, rel_to), rel_from);
 }
 
@@ -74,6 +75,8 @@ static fp_t linear_metric(struct task_struct* t)
         gmax  = weight_transfer(vcur, vmax, 
                                 t->rt_param.wt_slope, t->rt_param.wt_y,
                                 est_w);
+
+        BUG_ON(_eq(_sub(gmax, g1), FP(0)));
         return _div(_sub(vmax, v1),
                     _sub(gmax, g1));
 }
@@ -95,9 +98,15 @@ static inline int is_under_allocated(struct task_struct* t)
 
 static inline jiffie_t equal_point(struct task_struct* t)
 {
-        return _round(_div( FP(t->rt_param.times.exec_time), 
-                            get_est_weight(t))) -
-                (opt_time - get_last_release(t));
+        if (_lt(FP(0), get_est_weight(t)))
+                return _round(_div( FP(t->rt_param.times.exec_time), 
+                                    get_est_weight(t))) -
+                        (opt_time - get_last_release(t));
+        else
+                /* if the weight is zero we just take the 
+                 * deadline
+                 */
+                return t->rt_param.times.deadline;
 }
 
 static jiffie_t decrease_enactment_time(struct task_struct* t)