1 files changed, 10 insertions, 7 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 12e2cc381397..70dfc20fb8a1 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -624,7 +624,7 @@ static noinline void link_server(cpu_entry_t *entry,
                 /* Massive state check */
                 if (next_server->type == S_SRT) {
                         /* SRT task cannot get ahead of its server */
-                        BUG_ON(next_server->job_no <task_job_no(entry->linked));
+                        BUG_ON(next_server->job_no + 1 < task_job_no(entry->linked));
                         BUG_ON(lt_after(get_deadline(entry->linked),
                                         next_server->deadline));
                 } else if (next_server->type == S_HRT) {
@@ -863,6 +863,8 @@ static int catchup_srt_server(struct task_struct *task)
                 TRACE_SERVER_SUB(srt_server, "catching up to %llu, job %d",
                                  release, srt_server->job_no + jobs);
 
+                BUG_ON(jobs < 1);
+
                 /* Update server state */
                 server_release_at(srt_server, release);
                 srt_server->job_no += jobs - 1;
@@ -882,6 +884,8 @@ static int catchup_srt_server(struct task_struct *task)
                 srt_server->job_no = task_job_no(task);
         }
 
+        BUG_ON(srt_server->job_no == 0);
+
         return rv;
 }
 
@@ -967,11 +971,11 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
                         TRACE_SERVER_SUB(&hrt_server->server, "now ready");
                         hrt_server->ready = 1;
                         hrt_server->no_slack = 0;
-                        sched_trace_action(NULL, 2); /* Release */
+                        sched_trace_action(task, 2); /* Release */
                 } else if (lt_before_eq(slack, now) && !hrt_server->no_slack) {
                         /* The server missed the shift to no slack */
                         hrt_server->no_slack = 1;
-                        sched_trace_action(NULL, 3);
+                        sched_trace_action(task, 3);
                 } else if (!hrtimer_active(&hrt_server->slack_timer)) {
                         slack_timer_arm(hrt_server);
                 }
@@ -1670,11 +1674,10 @@ static void server_completed(server_t *server, struct task_struct *task)
         }
 
         unlink(task);
-        requeue(task, get_rt_domain(entry, task));
+        job_arrival(task, entry);
 
-        /* Need to pick the next task to run */
-        edf_hsb_pick_next(entry);
-        if (!entry->linked || entry->linked != task)
+        /* Boot off task if nothing was scheduled */
+        if (!entry->linked)
                 preempt_if_preemptable(entry->scheduled, entry->cpu);
 }