The first release of the servers is always implicit and the logic

for generating slack and causing preemptions is fixed in _schedule.

1 files changed, 15 insertions, 31 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 768b05280ad4..cd03cd748c60 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -645,6 +645,7 @@ static noinline void link_server(cpu_entry_t *entry,
                 } else if (next_server->type == S_HRT) {
                         /* HRT servers should never, ever migrate */
                         BUG_ON(entry->cpu != task_cpu(entry->linked));
+                        BUG_ON(!entry->hrt_server.ready);
                 } else if (next_server->type == S_SLACK) {
                         /* Should have already been removed from slack list */
                         BUG_ON(head_in_list(&task_data(entry->linked)->candidate_list));
@@ -662,15 +663,11 @@ static noinline void link_server(cpu_entry_t *entry,
                 server_run(entry->linked_server, entry->linked);
         }
 
-
-
         /* Timer necessary whenever an HRT is not running */
         if (!entry->linked || !is_hrt(entry->linked))
                 slack_timer_arm(&entry->hrt_server);
         else
                 slack_timer_cancel(&entry->hrt_server);
-
-
 }
 
 /*
@@ -944,11 +941,11 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
                                  now);
         }
 
-        if (hrt_server->ready && hrt_server->server.budget > 0) {
-                if (task && !is_eligible(task, hrt_server)) {
+        if (!hrt_server->server.budget ||
+            (task && !is_eligible(task, hrt_server))) {
+                    if (task)
                         TRACE_TASK_SUB(task, "not eligible");
-                        task = NULL;
-                }
+                    task = NULL;
         }
 
         return task;
@@ -1755,6 +1752,7 @@ static int admit_hrt_server(unsigned long long wcet,
                     cpu, wcet, period, 1);
         server_slack_create(&hrt_server->server);
         hrt_server->no_slack = 0;
+        hrt_server->ready = 1;
         hrt_server->server.type = S_HRT;
 
         edf_domain_init(&hrt_server->hrt_domain, NULL,
@@ -1804,7 +1802,7 @@ static void stop_hrt_servers(void)
                 slack_timer_cancel(hrt_server);
 
                 hrt_server->no_slack = 0;
-                hrt_server->ready = 1;
+                hrt_server->ready = 0;
                 hrt_server->server.period = 0;
                 hrt_server->server.wcet   = 0;
         }
@@ -1815,8 +1813,7 @@ static void stop_hrt_servers(void)
  */
 static void start_servers(lt_t time)
 {
-        int cpu, slack_cpu;
-        lt_t slack_fire;
+        int cpu;
         cpu_entry_t *entry;
         server_t *server;
         server_t *be_server;
@@ -1836,28 +1833,12 @@ static void start_servers(lt_t time)
                 if (!check_hrt_server_initialized(&entry->hrt_server))
                         goto loop_end;
 
-                server_release_at(server, time);
+                /* Cause a catchup later */
+                server_release_at(server, time - server->period);
                 entry->hrt_server.ready = 1;
 
-                slack_fire = server->deadline - server->budget;
-
-#ifdef SLACK_ON_MASTER
-                if (edf_hsb_release_master != NO_CPU)
-                        slack_cpu = edf_hsb_release_master;
-                else
-#endif
-                        slack_cpu = cpu;
-
-                hrtimer_start_on(slack_cpu, &entry->hrt_server.slack_timer_info,
-                                 &entry->hrt_server.slack_timer,
-                                 ns_to_ktime(slack_fire),
-                                 HRTIMER_MODE_ABS_PINNED);
-
                 TRACE("Setting up cpu %d to have timer deadline %llu\n",
                       cpu, TIME(server->deadline));
-                TRACE_SUB("slack timer %d armed to fire at %llu, %p",
-                          cpu, TIME(slack_fire), &entry->hrt_server.slack_timer);
-
         loop_end:
                 cpu = cpu;
         }
@@ -1869,7 +1850,9 @@ static void start_servers(lt_t time)
                 BUG_ON(bheap_node_in_heap(be_server->hn));
 
                 bheap_insert(server_order, &be_ready_servers, be_server->hn);
-                server_release_at(be_server, time);
+
+                /* Cause a catchup later */
+                server_release_at(be_server, time - be_server->period);
 
                 TRACE("Releasing BE server %d\n", be_server->id);
                 TRACE_SERVER_SUB(be_server, "inserting be server");
@@ -2064,7 +2047,8 @@ static struct task_struct* edf_hsb_schedule(struct task_struct *prev)
                 TRACE("NULL scheduled at %llu\n", TIME(litmus_clock()));
 
         /* We generated slack. Check to see if anyone wants to use it */
-        if (!was_slack && !list_empty(&slack_queue))
+        if (entry->linked && entry->linked_server->type != S_SLACK &&
+            head_in_list(&server_slack(entry->linked_server)->list))
                 check_for_global_preempt();
 
         raw_spin_unlock_irqrestore(global_lock, flags);