adaptive: introduce fixed point math

Introduces fixed point math header stuff and start of predictor support in
sched_adaptive.c

2 files changed, 17 insertions, 11 deletions

diff --git a/kernel/litmus.c b/kernel/litmus.c
index d3d397ae9e..62f69eb8cc 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -9,6 +9,7 @@
 #include <linux/litmus.h>
 #include <linux/sched.h>
 #include <linux/sched_plugin.h>
+#include <linux/fpmath.h>
 
 #include <linux/trace.h>
 
@@ -185,7 +186,8 @@ asmlinkage long sys_set_service_levels(pid_t pid,
         struct task_struct *target;
         service_level_t level, *klevels;
         int retval = -EINVAL, i;
-        unsigned long last_utility = 0;
+        fp_t last_value   = FP(0);
+        fp_t last_weight  = FP(0);
 
         TRACE("Setting up service levels for process %d.\n", pid);
 
@@ -233,18 +235,18 @@ asmlinkage long sys_set_service_levels(pid_t pid,
                         kfree(klevels);
                         goto out;
                 }
-                if (level.exec_cost <= 0)
-                        goto out;               
                 if (level.period <= 0)
                         goto out;
-                if (level.period < level.exec_cost)
+                if (_leq(level.weight, last_weight))
                         goto out;
-                if (level.utility <= last_utility)
+                if (_leq(level.value, last_value))
                         goto out;
-                last_utility = level.utility;
+                last_value  = level.value;
+                last_weight = level.weight;
                 klevels[i] = level;
         }
-        target->rt_param.basic_params.exec_cost   = klevels[0].exec_cost;
+        target->rt_param.basic_params.exec_cost   = _round(_mul(klevels[0].weight, 
+                                                                FP(klevels[0].period)));
         target->rt_param.basic_params.period      = klevels[0].period;
         target->rt_param.service_level            = klevels;
         target->rt_param.no_service_levels        = count;             
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c
index 16f249f03e..490e46501b 100644
--- a/kernel/sched_adaptive.c
+++ b/kernel/sched_adaptive.c
@@ -16,6 +16,9 @@
 #include <linux/edf_common.h>
 #include <linux/sched_trace.h>
 
+#include <linux/fpmath.h>
+#include <linux/sched_adaptive.h>
+
 /* Overview of GSN-EDF operations.
  *
  * For a detailed explanation of GSN-EDF have a look at the FMLP paper. This
@@ -116,14 +119,15 @@ static rt_domain_t adaptive;
 
 static void set_service_level(struct task_struct* t, unsigned int level)
 {
+        service_level_t *new;
         BUG_ON(!t);
         BUG_ON(t->rt_param.no_service_levels <= level);
         
         t->rt_param.cur_service_level  = level;
-        t->rt_param.basic_params.period = 
-                t->rt_param.service_level[level].period;        
-        t->rt_param.basic_params.exec_cost = 
-                t->rt_param.service_level[level].exec_cost;
+        new = t->rt_param.service_level + level;
+        t->rt_param.basic_params.period = new->period;    
+        t->rt_param.basic_params.exec_cost = _round(_mul(new->weight, 
+                                                         FP(new->period)));
         sched_trace_service_level_change(t);
         TRACE_TASK(t, "service level %u activated\n", level);
 }