Add additional donations

1 files changed, 12 insertions, 8 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 33192be7b6fe..8b544ec36e27 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -970,6 +970,8 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
                         /* The server missed the shift to no slack */
                         hrt_server->no_slack = 1;
                         sched_trace_action(NULL, 3);
+                } else if (!hrtimer_active(&hrt_server->slack_timer)) {
+                        slack_timer_arm(hrt_server);
                 }
 
         } else {
@@ -1995,7 +1997,8 @@ static void edf_hsb_task_block(struct task_struct *task)
 {
         unsigned long flags;
         cpu_entry_t *entry = task_sched_entry(task);
-        server_t *linked, *srt;
+        struct task_struct *linked;
+        server_t *linked_server;
 
         TRACE_TASK(task, "block at %llu\n", litmus_clock());
 
@@ -2003,13 +2006,13 @@ static void edf_hsb_task_block(struct task_struct *task)
 
         set_rt_flags(task, RT_F_BLOCK);
 
-        linked = entry->linked_server;
-        srt = task_srt_server(task);
+        linked = entry->linked;
+        linked_server = entry->linked_server;
 
         unlink(task);
 
-        if (is_srt(task) && srt == linked) {
-                check_donate_slack(task_srt_server(task), task);
+        if (task == linked) {
+                check_donate_slack(linked_server, task);
         }
 
         raw_spin_unlock_irqrestore(global_lock, flags);
@@ -2051,7 +2054,7 @@ static void edf_hsb_task_exit(struct task_struct *task)
 static struct task_struct* edf_hsb_schedule(struct task_struct *prev)
 {
         unsigned long flags;
-        int blocks, preempted, sleep, was_slack;
+        int blocks, preempted, sleep, was_slack, np;
         struct task_struct *curr;
         cpu_entry_t *entry = local_cpu_entry;
 
@@ -2087,9 +2090,10 @@ static struct task_struct* edf_hsb_schedule(struct task_struct *prev)
         preempted   = entry->scheduled != entry->linked;
         sleep       = curr && get_rt_flags(curr) == RT_F_SLEEP;
         was_slack   = !list_empty(&slack_queue);
+        np = curr && is_np(curr);
 
-        TRACE("blocks: %d, preempted: %d, sleep: %d\n",
-              blocks, preempted, sleep);
+        TRACE("blocks: %d, preempted: %d, sleep: %d, np: %d\n",
+              blocks, preempted, sleep, np);
         if (blocks)
                 unlink(entry->scheduled);