Add some infrastructure for reweighting.

Track error of allocation, prepare service level changes.

1 files changed, 26 insertions, 8 deletions

diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c
index 520a290be6..16f249f03e 100644
--- a/kernel/sched_adaptive.c
+++ b/kernel/sched_adaptive.c
@@ -3,7 +3,7 @@
  *
  * Implementation of Aaron's adaptive global EDF  scheduling algorithm.
  *
- * This scheduler is based on the GSN-EDF scheduler for simplicity reasons.
+ * This scheduler is based on the GSN-EDF scheduler.
  */
 
 #include <linux/percpu.h>
@@ -114,6 +114,21 @@ static LIST_HEAD(adaptive_cpu_queue);
 static rt_domain_t adaptive;
 
 
+static void set_service_level(struct task_struct* t, unsigned int level)
+{
+        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;
+        sched_trace_service_level_change(t);
+        TRACE_TASK(t, "service level %u activated\n", level);
+}
+
+
 /* update_cpu_position - Move the cpu entry to the correct place to maintain 
  *                       order in the cpu queue. Caller must hold adaptive lock.
  */
@@ -153,9 +168,8 @@ static noinline void link_task_to_cpu(struct task_struct* linked,
         BUG_ON(linked && !is_realtime(linked));
 
         /* Currently linked task is set to be unlinked. */
-        if (entry->linked) {
-                entry->linked->rt_param.linked_on = NO_CPU;
-        }
+        if (entry->linked)
+                entry->linked->rt_param.linked_on = NO_CPU;     
 
         /* Link new task to CPU. */
         if (linked) {           
@@ -360,14 +374,18 @@ static reschedule_check_t adaptive_scheduler_tick(void)
 /* caller holds adaptive_lock */
 static noinline void job_completion(struct task_struct *t)
 {
+        long delta;
         BUG_ON(!t);
 
         sched_trace_job_completion(t);
+        delta = t->rt_param.times.exec_time - 
+                t->rt_param.basic_params.exec_cost;
+        t->rt_param.stats.accumulated_error += delta;
+
 
-        TRACE_TASK(t, "job %d completes, delta WCET = %d\n", 
-                   t->rt_param.times.job_no, 
-                   t->rt_param.times.exec_time - 
-                   t->rt_param.basic_params.exec_cost);
+        TRACE_TASK(t, "job %d completes, delta WCET = %d, acc. error = %ld\n", 
+                   t->rt_param.times.job_no, delta,
+                   t->rt_param.stats.accumulated_error);
 
         /* set flags */
         set_rt_flags(t, RT_F_SLEEP);