cleanup: tidy up code before release2007.2

This gets rid of quite a few FIXMEs and TODOs, as well as some cruft.

1 files changed, 1 insertions, 80 deletions

diff --git a/kernel/sched_edf_hsb.c b/kernel/sched_edf_hsb.c
index c2a4c6c679..a2f670d994 100644
--- a/kernel/sched_edf_hsb.c
+++ b/kernel/sched_edf_hsb.c
@@ -1077,52 +1077,6 @@ static struct task_struct* null_heuristic(struct task_struct *prev,
                 return NULL;
 }
 
-/*static struct task_struct* history_heuristic(struct task_struct *prev, rt_domain_t* edf)
-{
-        struct list_head *pos;
-        struct task_struct* tsk = NULL;
-        struct task_struct* cur;
-
-        if (is_realtime(prev) && is_running(prev) && 
-            get_rt_flags(prev) != RT_F_SLEEP)
-                tsk = prev;
-        list_for_each(pos, &edf->ready_queue) {
-                cur = list_entry(pos, struct task_struct, rt_list);
-                if (!tsk || 
-                    tsk->rt_param.stats.nontardy_jobs_ctr > 
-                    cur->rt_param.stats.nontardy_jobs_ctr)
-                        tsk = cur;              
-        }
-        if (tsk && tsk->rt_param.stats.nontardy_jobs_ctr < 5)
-                return tsk;
-        else
-                return NULL;
-}
-*/
-/* TODO: write slack heuristic.*/
-/*static struct task_struct* slack_heuristic(struct task_struct *prev, rt_domain_t* edf)
-{
-        struct list_head *pos;
-        struct task_struct* tsk = NULL;
-        struct task_struct* cur;
-
-        if (is_realtime(prev) && is_running(prev) && 
-            get_rt_flags(prev) != RT_F_SLEEP)
-                tsk = prev;
-        list_for_each(pos, &edf->ready_queue) {
-                cur = list_entry(pos, struct task_struct, rt_list);
-                if (!tsk || 
-                    tsk->rt_param.stats.nontardy_job_ctr > 
-                    cur->rt_param.stats.nontardy_job_ctr)
-                        tsk = cur;              
-        }
-        if (tsk && tsk->rt_param.stats.nontardy_job_ctr < 5)
-                return tsk;
-        else
-                return NULL;
-}*/
-
-
 /* caller holds all locks
  */
 
@@ -1229,7 +1183,7 @@ static int schedule_srt_be_cap(struct task_struct *prev,
         int             deactivate = 1;
         be_server_t*    bes;
         cpu_state_t*    state;
-        int             type; /* FIXME: Initialize? */
+        int             type = BG; 
 
 reschedule:     
         write_lock_irqsave(&srt.ready_lock, flags);
@@ -1531,9 +1485,6 @@ static void hsb_wake_up_task(struct task_struct *task)
         }
         else if (task->time_slice) {
                 /* came back in time before deadline
-                 * TODO: clip budget to fit into period, otherwise it could 
-                 *       cause a deadline overrun in the next period, i.e. 
-                 *       over allocation in the next period.
                  */
                 set_rt_flags(task, RT_F_RUNNING);
                 hsb_add_ready(task);
@@ -1546,43 +1497,16 @@ static void hsb_wake_up_task(struct task_struct *task)
 
 static void hsb_task_blocks(struct task_struct *t)
 {
-        /* CLEANUP: The BUG_ON actually triggerd in a really weierd case if a 
-         *          BEST_EFFORT gets caught in a migration right after execv
-         *          The next version of Litmus should deal with this more gracefully.
-         */
-
-        /*BUG_ON(!is_realtime(t));*/
         /* not really anything to do since it can only block if 
          * it is running, and when it is not running it is not in any 
          * queue anyway.
-         *
-         * TODO: Check whether the assumption is correct for SIGKILL and 
-         *       SIGSTOP.
          */
         TRACE("task %d blocks with budget=%d\n", t->pid, t->time_slice);
-        /*BUG_ON(t->rt_list.next != LIST_POISON1);*/
-        /*BUG_ON(t->rt_list.prev != LIST_POISON2);*/
-
         if (is_be(t))
                 sched_trace_job_completion(t);
 }
 
 
-/* When _tear_down is called, the task should not be in any queue any more
- * as it must have blocked first. We don't have any internal state for the task,
- * it is all in the task_struct.
- */
-static long hsb_tear_down(struct task_struct * t)
-{
-        /* CLEANUP: see hsb_task_blocks */
-        /*BUG_ON(!is_realtime(t));
-        TRACE("edf-hsb: tear down called for %d \n", t->pid);
-        BUG_ON(t->array);
-        BUG_ON(t->rt_list.next != LIST_POISON1);
-        BUG_ON(t->rt_list.prev != LIST_POISON2);*/
-        return 0;
-}
-
 static int hsb_mode_change(int new_mode)
 {
         int cpu;
@@ -1769,8 +1693,6 @@ static sched_plugin_t s_plugin __cacheline_aligned_in_smp = {
         .scheduler_tick         = hsb_scheduler_tick,\
         .prepare_task           = hsb_prepare_task,\
         .sleep_next_period      = edf_sleep_next_period,\
-        .tear_down              = hsb_tear_down,\
-        .shutdown_hook          = 0,\
         .schedule               = hsb_schedule,\
         .finish_switch          = hsb_finish_switch,\
         .mode_change            = hsb_mode_change,\
@@ -1789,7 +1711,6 @@ sched_plugin_t *__init init_edf_hsb_plugin(void)
                 capacity_queue_init(&cap_queue);
                 edf_domain_init(&srt, srt_check_resched);
                 edf_domain_init(&be, be_check_resched);
-                /* TODO: Re-implement FIFO time slicing, was 50ms. */
                 fifo_domain_init(&hsb_fifo, NULL);
                 for (i = 0; i < NR_CPUS; i++)
                 {