progress

1 files changed, 9 insertions, 6 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 1e62bec32f2f..a1b1d9655b46 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -680,9 +680,7 @@ static noinline void unlink_server(cpu_entry_t *entry, int requeue)
 
                 /* Donator needs to absorb slack execution time */
                 reclaim_slack(server);
-        } else if (server->type != S_SRT &&
-                   (server->type == S_BE || !hrt_server->ready)) {
-
+        } else if (server->type != S_SRT) {
                 requeue_server(server);
         }
 
@@ -971,11 +969,16 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
                         TRACE_SERVER_SUB(&hrt_server->server, "now ready");
                         hrt_server->ready = 1;
 
-                        if (lt_before_eq(slack, now))
+                        slack = lt_subtract(hrt_server->server.deadline,
+                                            hrt_server->server.budget);
+
+                        if (lt_before_eq(slack, now)) {
                                 hrt_server->no_slack = 1;
-                        else
+                                sched_trace_action(task, 3);
+                        } else {
                                 hrt_server->no_slack = 0;
-                        sched_trace_action(task, 2); /* Release */
+                                sched_trace_action(task, 2);
+                        }
                 } else if (lt_before_eq(slack, now) && !hrt_server->no_slack) {
                         /* The server missed the shift to no slack */
                         hrt_server->no_slack = 1;