Changed the scheduling algorithms to include more usefull tags

3 files changed, 20 insertions, 7 deletions

diff --git a/kernel/edf_common.c b/kernel/edf_common.c
index 16b589d3e7..4746c6642c 100644
--- a/kernel/edf_common.c
+++ b/kernel/edf_common.c
@@ -71,6 +71,7 @@ void edf_release_at(struct task_struct *t, jiffie_t start)
 {
         t->rt_param.times.deadline = start;
         edf_prepare_for_next_period(t);
+        t->rt_param.times.last_release = start;
         set_rt_flags(t, RT_F_RUNNING);  
 }
 
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c
index f78b4d848d..0d524cf258 100644
--- a/kernel/sched_adaptive.c
+++ b/kernel/sched_adaptive.c
@@ -1,3 +1,4 @@
+
 /*
  * kernel/sched_adaptive.c
  *
@@ -203,11 +204,17 @@ static void update_weight_estimate(struct task_struct* t)
         nw        = t->rt_param.opt_nw;
         exec_time = t->rt_param.times.exec_time;
         sl_period = get_sl(t, get_opt_sl(t)).period;
-        
-        t->rt_param.predictor_state.estimate =
-                _div( _max(_mul(nw, FP(sl_period)), FP(exec_time)),
-                      FP(get_deadline(t) - get_last_release(t)));
-        TRACE_TASK(t, " update_weight_estimate: " _FP_ " => " _FP_ "\n", ow, get_est_weight(t));
+
+        /*TRACE("ow=" _FP_ " nw=" _FP_ ", r-d " _FP_ ", deadline %d, release %d, exec_time=%ld sl_period=%lu\n",
+          fp2str(ow), fp2str(nw),fp2str(FP(get_deadline(t)-get_last_release(t))), get_deadline(t), get_last_release(t), exec_time, sl_period);*/
+
+        t->rt_param.predictor_state.estimate = nw;
+        TRACE_TASK(t, "AAAupdate_weight_estimate from " _FP_ " to "_FP_"\n", fp2str(ow), fp2str(nw));
+
+                /*_div( _max(_mul(nw, FP(sl_period)), FP(exec_time)),
+                      FP(get_deadline(t) - get_last_release(t)));       
+        TRACE_TASK(t, " update_weight_estimate: " _FP_ " => " _FP_ "\n", 
+        fp2str(ow), fp2str(get_est_weight(t)));*/
 }
 
 
@@ -364,8 +371,12 @@ void adaptive_optimize(void)
          *    also account for weight.
          *    Also establish current estimated utilization
          */
-        list_for_each(p, &list) {
+        list_for_each_safe(p, extra, &list) {           
                 t  = list_entry(p, struct task_struct, rt_param.opt_list);
+                if (time_before(opt_time, get_last_release(t))) {
+                        list_del(p);
+                        continue;
+                }
                 t->rt_param.opt_order = linear_metric(t);               
                 TRACE_TASK(t, "est_w = " _FP_ " L = " _FP_ "\n", 
                            get_est_weight(t),
@@ -1106,7 +1117,7 @@ sched_plugin_t *__init init_adaptive_plugin(void)
 
         /* magic values given in the paper */
         fc_a = _frac(  102, 1000);
-        fc_b = _frac(-1975, 1000);
+        fc_b = _frac(  303, 1000);
         
         optimizer_period = 1000;
         task_error_threshold = _frac(1, 2);
diff --git a/kernel/sched_trace.c b/kernel/sched_trace.c
index bbaf26ba10..d41c6e6b74 100644
--- a/kernel/sched_trace.c
+++ b/kernel/sched_trace.c
@@ -635,6 +635,7 @@ void sched_trace_job_completion(struct task_struct *t)
         tinfo(rec.task, t);
         rtinfo(rec, t);
         rec.tardiness = jiffies - t->rt_param.times.deadline;
+        TRACE_TASK(t, "AAATardiness : %d\n", rec.tardiness);
         put_trace(rec);
 }