1 files changed, 16 insertions, 21 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 8ed59d873e61..fc533502f5ac 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -974,10 +974,10 @@ static struct task_struct* next_eligible_slack(void)
 {
         struct task_struct *next = get_candidate(slack_candidates.next);
 
+        /* We couldn't find an SRT to schedule. Find a BE which is
+         * either tardy or cannot run due to a lack of servers.
+         */
         if (!next) {
-                /* We couldn't find an SRT to schedule. Find a BE which is
-                 * either tardy or cannot run due to a lack of servers.
-                 */
                 next = __peek_ready(&be_domain);
         }
         return next;
@@ -1289,6 +1289,10 @@ static void remove_from_ready(server_t *server, struct task_struct *task,
                               cpu_entry_t *entry)
 {
         server_t *slack;
+        rt_domain_t *domain;
+        BUG_ON(!server);
+        BUG_ON(!entry);
+        BUG_ON(!task);
 
         if (server->type == S_SLACK) {
                 TRACE_SERVER_SUB(server, "removed from slack list");
@@ -1301,20 +1305,26 @@ static void remove_from_ready(server_t *server, struct task_struct *task,
                 }
         } else {
                 slack = server_slack(server);
+                BUG_ON(!slack);
                 if (head_in_list(&slack->list)) {
                         remove_slack(slack);
                 }
                 if (server->type == S_BE) {
                         TRACE_SERVER_SUB(server, "server removed from ready");
+                        BUG_ON(!server->hn);
                         bheap_delete(server_order, &be_ready_servers,
                                      server->hn);
                 }
                 if (is_queued(task)) {
+                        domain = get_rt_domain(entry, task);
+                        BUG_ON(!domain);
                         TRACE_TASK_SUB(task, "removed from ready");
-                        remove(get_rt_domain(entry, task), task);
+                        remove(domain, task);
                 }
         }
 
+        BUG_ON(!task_data(task));
+
         /* Remove from consideration of slack servers */
         if (head_in_list(&task_data(task)->candidate_list)) {
                 TRACE_TASK_SUB(task, "deleting candidate");
@@ -1411,16 +1421,6 @@ static noinline void check_for_slack_preempt(struct task_struct *task,
                 if (entry != next_entry) {
                         TRACE_TASK_SUB(task, "was on P%d", entry->cpu);
 
-                        BUG_ON(entry->linked_server->type != S_SLACK &&
-                               server->type == S_SLACK && entry->linked_server->type == S_BE);
-                        BUG_ON(entry->linked_server->type != S_SLACK &&
-                               server->type == S_SRT && entry->linked_server->type == S_SRT);
-                        BUG_ON(entry->linked_server->type != S_SLACK &&
-                               server->type == S_SRT);
-                        BUG_ON(entry->linked_server->type == S_BE && server->type == S_BE);
-                        BUG_ON(entry->linked_server->type == S_SRT && server->type == S_SLACK);
-                        BUG_ON(entry->linked_server->type != S_SLACK);
-
                         unlink(task);
 
                         if (resched) {
@@ -2063,6 +2063,8 @@ static long edf_hsb_admit_task(struct task_struct *task)
 {
         cpu_entry_t *entry = task_sched_entry(task);
 
+        TRACE_TASK(task, "Admitting\n");
+
         if (is_hrt(task)) {
                 return check_hrt_server_initialized(&entry->hrt_server) &&
                         ((task_cpu(task) == task->rt_param.task_params.cpu) &&
@@ -2190,13 +2192,6 @@ static struct task_struct* edf_hsb_schedule(struct task_struct *prev)
               TIME(litmus_clock()), entry->hrt_server.no_slack,
               entry->hrt_server.ready);
 
-        if (curr != prev && prev->pid == 0) {
-                TRACE_SUB("should bug");
-        } else if (curr && !is_realtime(prev)) {
-                TRACE_TASK_SUB(prev, "not realtime");
-                BUG_ON(1);
-        }
-
         /* Determine state */
         blocks      = curr && !is_running(curr);
         preempted   = entry->scheduled != entry->linked;