Possible bug fixes

1 files changed, 8 insertions, 8 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index fba64f6ec02f..fd2070c6f94d 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -439,9 +439,12 @@ static noinline server_t* next_eligible_slack_server(void)
  */
 static noinline struct task_struct* next_eligible_slack(void)
 {
-        struct task_struct *next = NULL;
+        struct task_struct *next = get_candidate(slack_candidates.next);
 
-        next = get_candidate(slack_candidates.next);
+        while (next && task_srt_server(next)->job_no <= task_job_no(next)) {
+                list_del_init(&task_data(next)->candidate_list);
+                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.
@@ -724,6 +727,9 @@ static noinline void link_server(cpu_entry_t *entry,
                         BUG_ON(head_in_list(&task_data(entry->linked)->candidate_list));
                         BUG_ON(is_be(entry->linked) && is_queued(entry->linked));
                         sched_trace_action(entry->linked, SLACK_RUN_ACTION);
+                        BUG_ON(is_srt(entry->linked) &&
+                               task_srt_server(entry->linked)->job_no <=
+                               task_job_no(entry->linked));
                 } else { /* BE */
                         /* Should have already been removed from ready heap */
                         BUG_ON(bheap_node_in_heap(next_server->hn));
@@ -1723,14 +1729,8 @@ static void job_completion(cpu_entry_t *entry, struct task_struct* task)
                                       "rel: %llu, dead: %llu",
                                       TIME(get_release(task)),
                                       TIME(get_deadline(task)));
-                check_slack_candidate(task);
-                sched_trace_task_completion(task, 1);
-
-                return;
         }
 
-        BUG_ON(is_queued(task));
-
         if (server->type == S_SRT) {
                 /* If the task is behind the server it must release immediately,
                  * leaving its release time and deadline unchanged.