Fixed bug where tasks which finished under slack prevented a plugin switch.

2 files changed, 5 insertions, 22 deletions

diff --git a/litmus/litmus.c b/litmus/litmus.c
index 38f276d67095..657b4eda96e6 100644
--- a/litmus/litmus.c
+++ b/litmus/litmus.c
@@ -371,9 +371,9 @@ void litmus_exit_task(struct task_struct* tsk)
                 if (!bheap_node_in_heap(tsk_rt(tsk)->heap_node)) {
                         bheap_node_free(tsk_rt(tsk)->heap_node);
                         release_heap_free(tsk_rt(tsk)->rel_heap);
-                        atomic_dec(&rt_task_count);
                         reinit_litmus_state(tsk, 1);
                 }
+                atomic_dec(&rt_task_count);
         }
 }
 
diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 7fd3d545234d..6d0e8a74e4ae 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -62,8 +62,6 @@
 #define SLACK_DONATED_ACTION    8
 #define CANDIDATE_ADDED_ACTION  9
 
-atomic_t servers_running = ATOMIC_INIT(0); /* TODO should be unnecessary */
-
 /* Uncomment for human readable time */
 #define TIME(x)                                 \
         (x)
@@ -1820,7 +1818,7 @@ static void servers_released(struct list_head *servers)
                         TRACE_SERVER_SUB(server, "inserting BE server");
                         bheap_insert(server_order, &be_ready_servers,
                                      server->hn);
-                        check_donate_slack(server);
+                        check_donate_slack(server, NULL);
                 } else { /* HRT server */
                         hrt_server_released(server);
                 }
@@ -1889,10 +1887,6 @@ static void stop_be_servers(void)
         server_t *be_server;
         struct list_head *pos, *safe;
 
-        //atomic_set(&servers_running, 0);
-
-        TRACE_SUB("stopping BE servers");
-
         list_for_each_safe(pos, safe, &be_servers) {
                 be_server = list_entry(pos, server_t, list);
 
@@ -1960,8 +1954,6 @@ static void stop_hrt_servers(void)
         cpu_entry_t        *entry;
         hrt_server_t       *hrt_server;
 
-        //atomic_set(&servers_running, 0);
-
         for_each_online_cpu(cpu) {
                 entry       = &per_cpu(cpu_entries, cpu);
                 hrt_server  = &entry->hrt_server;
@@ -1988,10 +1980,6 @@ static void start_servers(lt_t time)
         server_t *be_server;
         struct list_head *pos;
 
-        if (atomic_read(&servers_running))
-                return;
-        atomic_set(&servers_running, 1);
-
         TRACE_SUB("starting servers at %llu", time);
 
         /* Start HRT servers */
@@ -2051,6 +2039,8 @@ static long edf_hsb_activate_plugin(void)
                         update_cpu_position(entry);
         }
 
+        start_servers(litmus_clock());
+
         TRACE("activating EDF-HSB plugin.\n");
         return 0;
 }
@@ -2088,12 +2078,10 @@ static long edf_hsb_deactivate_plugin(void)
 
         local_irq_save(flags);
 
-        /* stop_be_servers(); */
-        /* stop_hrt_servers(); */
-
         for_each_online_cpu(cpu) {
                 cpu_entry  = &per_cpu(cpu_entries, cpu);
                 hrt_server = &cpu_entry->hrt_server;
+
                 slack_timer_cancel(hrt_server);
 
                 if (likely(bheap_node_in_heap(cpu_entry->hn)))
@@ -2331,11 +2319,6 @@ static void edf_hsb_task_wake_up(struct task_struct *task)
 
         raw_spin_lock_irqsave(global_lock, flags);
 
-        /* A task set was released. Start servers. */
-        if (unlikely(!atomic_read(&servers_running)))
-                start_servers(get_deadline(task) - get_rt_period(task) -
-                              get_rt_phase(task));
-
         if (!is_be(task)) {
                 if (is_srt(task)) {
                         catchup_srt_server(task);