adaptive: Aaron's fixes, clean out debug, and merge header

This patch is a collection of several changes. It includes Aaron's fixes
to prevent division by zero, makes it possible to disable the optimizer
debug output, and merges the header file into the scheduler implementation
since it is not being used anywhere else.

1 files changed, 0 insertions, 161 deletions

diff --git a/include/linux/sched_adaptive.h b/include/linux/sched_adaptive.h
deleted file mode 100644
index 81b803ad31..0000000000
--- a/include/linux/sched_adaptive.h
+++ /dev/null
@@ -1,161 +0,0 @@
-#ifndef __ADAPTIVE_H__
-#define __ADAPTIVE_H__
-
-/* All time dependent functions 
- * rely on this field. 
- * Update in the optimizer before use!
- */
-extern jiffie_t opt_time;
-
-
-static inline fp_t ideal(fp_t weight, jiffie_t delta_t)
-{
-        return _mul(weight, FP(delta_t));
-}
-
-static noinline long ideal_exec_time(struct task_struct* t)
-{
-        jiffie_t delta = opt_time - get_last_release(t);
-        return _round(ideal(get_est_weight(t), delta));
-}
-
-/* this makes a whole bunch of linearity assumptions */
-static noinline fp_t weight_transfer(struct task_struct* t,
-                                   unsigned int from, unsigned int to,
-                                   fp_t act_weight)
-{
-        fp_t rel_from, rel_to, ret;
-        rel_from = get_sl(t, from).weight;
-        rel_to   = get_sl(t, to).weight;
-        ret.val = (act_weight.val * rel_to.val) / rel_from.val;
-        /*_div(_mul(act_weight, rel_to), rel_from);*/
-        TRACE("weight_transfer(%ld, %ld, %ld) => %ld  to=%u from=%u\n", 
-              rel_from.val, rel_to.val, act_weight.val, ret.val, from, to);
-        return ret;
-}
-
-static noinline fp_t est_weight_at(struct task_struct* t, unsigned int level)
-{
-        if (t->rt_param.no_service_levels)
-                return weight_transfer(t, get_cur_sl(t), level, 
-                                       get_est_weight(t));
-        else
-                return get_est_weight(t);
-                               
-}
-
-static noinline void update_estimate(predictor_state_t *state, fp_t actual_weight,
-                                     fp_t a, fp_t b)
-{
-        fp_t err, new;
-        
-        TRACE("OLD ESTIMATE Weight" _FP_ " ActWt " _FP_ " A:" _FP_ ", B:" _FP_
-              "\n", fp2str(state->estimate), fp2str(actual_weight), fp2str(a),
-              fp2str(b));
-
-        err                = _sub(actual_weight, state->estimate);
-        new = _add(_mul(a, err), 
-                   _mul(b, state->accumulated));
-        state->estimate = new;
-        state->accumulated = _add(state->accumulated, err);
-        TRACE("ERROR " _FP_ ", NEW " _FP_ ", ACC" _FP_ "\n", fp2str(err),
-              fp2str(new), fp2str(state->accumulated));
-}
-
-static noinline fp_t linear_metric(struct task_struct* t) 
-{
-        fp_t v1, vmax, g1, gmax;
-        fp_t est_w;
-        unsigned int l    = t->rt_param.no_service_levels;
-        unsigned int lcur;
-
-        if (l <= 1)
-                return FP(0);
-
-        lcur  = get_cur_sl(t);;
-        est_w = get_est_weight(t);
-
-        TRACE_TASK(t, " linear_metric: lcur=%u l=%u est_w=" _FP_ "\n", 
-                   lcur, l, est_w);
-/*      TRACE_TASK(t, " linear_metric: est_w.val=%ld\n", est_w.val); */
-
-
-        v1    = t->rt_param.service_level[0].value;
-        vmax  = t->rt_param.service_level[l - 1].value;
-
-        TRACE_TASK(t, " linear_metric: v1=" _FP_ " vmax=" _FP_  "\n", v1, vmax);
-/*      TRACE_TASK(t, " linear_metric: v1=%ld vmax=%ld\n", v1.val, vmax.val);*/
-
-
-        g1    = weight_transfer(t, lcur, 0, est_w);
-        gmax  = weight_transfer(t, lcur, l - 1, est_w);
-
-        TRACE_TASK(t, " linear_metric: g1=" _FP_ " gmax=" _FP_  "\n", g1, gmax);
-/*      TRACE_TASK(t, " linear_metric: g1=%ld gmax=%ld\n", g1, gmax); */
-
-
-        TRACE_BUG_ON(_eq(_sub(gmax, g1), FP(0)));
-        if (_eq(_sub(gmax, g1), FP(0)))
-                return FP(0);
-        return _div(_sub(vmax, v1),
-                    _sub(gmax, g1));
-}
-
-static noinline  unsigned long reweighted_period(fp_t ow, fp_t nw, unsigned long alloc,
-                                                 jiffie_t deadline, jiffie_t release) 
-{
-        fp_t dl;
-        dl = _mul(FP(deadline - release), ow);
-        dl = _sub(dl, FP(alloc));
-        dl = _div(dl, nw);
-        return _round(dl);
-}
-
-static noinline int is_under_allocated(struct task_struct* t)
-{
-        return ideal_exec_time(t) >= t->rt_param.times.exec_time;
-}
-
-static noinline jiffie_t dec_equal_point_delay(struct task_struct* t)
-{
-        if (_lt(FP(0), get_est_weight(t)))
-                /* when t was released plus time needed to equalize
-                 * minus now 
-                 */
-                return get_last_release(t) +  
-                        _round(_div( FP(t->rt_param.times.exec_time), 
-                                     get_est_weight(t))) -
-                        opt_time;
-        else
-                /* if the weight is zero we just take the 
-                 * deadline
-                 */
-                return t->rt_param.times.deadline;
-}
-
-static noinline jiffie_t inc_equal_point_delay(struct task_struct* t)
-{
-        if (_lt(FP(0), t->rt_param.opt_nw))
-                /* when t was released plus time needed to equalize
-                 * minus now 
-                 */
-                return  get_last_release(t) +
-                        _round(_div( FP(t->rt_param.times.exec_time), 
-                                     t->rt_param.opt_nw)) -
-                        opt_time;
-        else
-                /* if the weight is zero we just take the 
-                 * deadline
-                 */
-                return t->rt_param.times.deadline;
-}
-
-static noinline jiffie_t decrease_delay(struct task_struct* t)
-{       
-        if (has_active_job(t) && !is_under_allocated(t))
-                return dec_equal_point_delay(t);        
-        return 0;
-}
-
-
-#endif