adaptive: only send signal when requested.

3 files changed, 23 insertions, 5 deletions

diff --git a/kernel/litmus.c b/kernel/litmus.c
index 6da271f047..35160b7dd4 100644
--- a/kernel/litmus.c
+++ b/kernel/litmus.c
@@ -497,7 +497,18 @@ asmlinkage spolicy sys_sched_getpolicy(void)
 
 asmlinkage int sys_scheduler_setup(int cmd, void __user *parameter) 
 {
-        return curr_sched_plugin->scheduler_setup(cmd, parameter);
+        int ret = -EINVAL;
+
+        switch (cmd) {          
+        case ENABLE_WEIGHT_CHANGE_SIGNAL:
+                current->rt_param.signal_ready = 1;
+                ret = 0;
+                break;
+        default:
+                ret = curr_sched_plugin->scheduler_setup(cmd, parameter);               
+        };
+
+        return ret;
 }
 
 /* only call with interrupts disabled! */
diff --git a/kernel/sched_adaptive.c b/kernel/sched_adaptive.c
index 4a4ab430e0..f78b4d848d 100644
--- a/kernel/sched_adaptive.c
+++ b/kernel/sched_adaptive.c
@@ -186,7 +186,8 @@ static void set_service_level(struct task_struct* t, unsigned int level)
         t->rt_param.basic_params.exec_cost = _round(_mul(new->weight, 
                                                          FP(new->period)));
 
-        scheduler_signal(t, SIGUSR1);
+        if (t->rt_param.signal_ready)
+                scheduler_signal(t, SIGUSR1);
 
         sched_trace_service_level_change(t);
         TRACE_TASK(t, "service level %u activated\n", level);
@@ -195,9 +196,10 @@ static void set_service_level(struct task_struct* t, unsigned int level)
 /* call this _before_ updating deadline and release of t */
 static void update_weight_estimate(struct task_struct* t)
 {
-        fp_t nw;
+        fp_t nw, ow;
         jiffie_t sl_period, exec_time;
-        
+
+        ow        = get_est_weight(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;
@@ -205,6 +207,7 @@ static void update_weight_estimate(struct task_struct* t)
         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));
 }
 
 
@@ -789,6 +792,10 @@ static noinline void job_completion(struct task_struct *t)
         old_estimate = get_est_weight(t);
         update_estimate(&t->rt_param.predictor_state, actual_weight, 
                         fc_a, fc_b);
+
+        TRACE_TASK(t, " weight estimation: error=" _FP_  " weight=" _FP_ " => " _FP_ "\n",
+                   _sub(get_est_weight(t), old_estimate),
+                   old_estimate, get_est_weight(t));
         if (_gt(_div(_abs(_sub(get_est_weight(t), old_estimate)),
                      get_est_weight(t)), 
                 task_error_threshold)) {
diff --git a/kernel/sched_edf_hsb.c b/kernel/sched_edf_hsb.c
index 075d61c024..c2a4c6c679 100644
--- a/kernel/sched_edf_hsb.c
+++ b/kernel/sched_edf_hsb.c
@@ -1626,7 +1626,7 @@ static int hsb_mode_change(int new_mode)
 }
 
 
-typedef enum {
+typedef enum {  
         EDF_HSB_SET_HRT,
         EDF_HSB_GET_HRT,
         EDF_HSB_CREATE_BE