4 files changed, 14 insertions, 3013 deletions

diff --git a/litmus/Makefile b/litmus/Makefile
index 9468312b39e4..62c2bb064581 100644
--- a/litmus/Makefile
+++ b/litmus/Makefile
@@ -18,8 +18,7 @@ obj-y     = sched_plugin.o litmus.o \
             ctrldev.o \
             servers.o \
             sched_gsn_edf.o \
-            sched_edf_hsb.o \
-            sched_edf_hsb_noslack.o
+            sched_edf_hsb.o
 
 obj-$(CONFIG_PLUGIN_CEDF) += sched_cedf.o
 obj-$(CONFIG_PLUGIN_PFAIR) += sched_pfair.o
diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index d74f4337ac2b..4bc6c1382171 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -1,29 +1,7 @@
 /*
  * litmus/sched_edf_hsb.c
  *
- * Implentation of the EDF-HSB scheduling algorithm.
- *
- * The following 6 events are fired by timers and not handled by
- * the plugin infrastructure itself:
- *
- * release_[hrt|srt|be]_jobs
- * [hrt|be]_server_released
- * server_completed (for HRT, SRT, and BE)
- *
- * The following 4 events are caused by a write to the proc entry
- * and should never be run when the plugin is already running:
- * stop_[hrt|be]_servers
- * admit_[hrt|be]_server
- *
- * TODO system for removing tasks from their release queues
- * TODO clean up link_to_cpu and check_slack args
- * TODO move slack completion into release
- * TODO fix concurrent arms
- * TODO slack and BE servers, include slack higher prio
- * TODO start servers should no longer be cessary
- * TODO harmonize order of method arguments
- * TODO test crazy task_new hack
- * TODO remove bheap_node_in_heap check in litmus_exit_task
+ * Implementation of the EDF-HSB scheduling algorithm.
  */
 #include <linux/module.h>
 #include <linux/uaccess.h>
@@ -43,32 +21,17 @@
 #include <litmus/servers.h>
 #define DEBUG_EDF_HSB
 
-/* DOES NOT WORK */
-//#define SLACK_ON_MASTER
-
 #define BE_PROC_NAME    "be_servers"
 #define HRT_PROC_NAME   "hrt_servers"
 #define BE_SERVER_BASE  100
 #define IDLE_SLACK_BASE 1000
 #define SLACK_MIN       NSEC_PER_MSEC
 
-/* SCHED_TRACE action events */
-#define SERVER_COMPLETED_ACTION 1
-#define SERVER_RELEASED_ACTION  2
-#define NO_SLACK_ACTION         3
-#define SLACK_RUN_ACTION        4
-#define SLACK_STOP_ACTION       5
-#define SLACK_RECLAIM_ACTION    6
-#define SLACK_EXPIRED_ACTION    7
-#define SLACK_DONATED_ACTION    8
-#define CANDIDATE_ADDED_ACTION  9
-
 /* Uncomment for human readable time */
-#define TIME(x)                                 \
-        (x)
-/* ({lt_t y = x;                                \ */
-/* do_div(y, NSEC_PER_MSEC);               \ */
-/* y;}) */
+#define TIME(x)                         \
+({lt_t y = x;                           \
+do_div(y, NSEC_PER_MSEC);               \
+y;})
 #define TRACE_TIMER(fmt, args...)                                       \
         sched_trace_log_message("%d P%d*[%s@%s:%d]: " fmt " at %d\n",   \
                                 TRACE_ARGS,  ## args, TIME(litmus_clock()))
@@ -77,28 +40,6 @@
                     (t)->rt_param.job_params.job_no,  ## args)
 
 /*
- * Useful debugging macros. Remove for actual use as they cause
- * a lot of lock contention.
- */
-#ifdef DEBUG_EDF_HSB
-
-#define TRACE_SUB(fmt, args...)                                         \
-        sched_trace_log_message("%d P%d      [%s@%s:%d]: " fmt "\n",    \
-                                TRACE_ARGS,  ## args)
-#define TRACE_TASK_SUB(t, fmt, args...)                         \
-        TRACE_SUB(TASK_FMT " " fmt, TASK_ARGS(t), ##args)
-#define TRACE_SERVER_SUB(s, fmt, args...)                       \
-        TRACE_SUB(SERVER_FMT " " fmt, SERVER_ARGS(s), ##args)
-#define TRACE_TASK_SERVER_SUB(t, s, fmt, args...)                       \
-        TRACE_TASK_SUB(t, SERVER_FMT " " fmt, SERVER_ARGS(s), ##args)
-#else
-#define TRACE_SUB(fmt, args...)
-#define TRACE_TASK_SUB(t, fmt, args...)
-#define TRACE_SERVER_SUB(s, fmt, args...)
-#define TRACE_TASK_SERVER_SUB(t, s, fmt, args...)
-#endif
-
-/*
  * Different types of servers
  */
 typedef enum {
@@ -186,7 +127,6 @@ static struct sched_plugin edf_hsb_plugin __cacheline_aligned_in_smp;
  */
 static inline int head_in_list(struct list_head *head)
 {
-        BUG_ON(!head);
         return !(head->next == head->prev && head->prev == head);
 }
 
@@ -242,8 +182,6 @@ static void remove_slack(server_t *slack)
 {
         if (!slack)
                 return;
-        TRACE_SERVER_SUB(slack, "slack removed");
-        //////sched_trace_action(NULL, SLACK_EXPIRED_ACTION);
 
         if (head_in_list(&slack->list))
                 list_del_init(&slack->list);
@@ -260,12 +198,8 @@ static void add_slack(server_t *slack)
         struct list_head *pos;
         server_t *queued;
 
-        TRACE_SERVER_SUB(slack, "slack added");
-
-        if (head_in_list(&slack->list)) {
-                TRACE_SERVER_SUB(slack, "already in list");
+        if (head_in_list(&slack->list))
                 return;
-        }
 
         list_for_each_prev(pos, &slack_queue) {
                 queued = list_entry(pos, server_t, list);
@@ -303,8 +237,6 @@ static void add_slack_candidate(struct task_struct *task)
         struct list_head *pos;
         struct task_struct *queued;
 
-        TRACE_TASK_SUB(task, "candidate added");
-
         list_for_each_prev(pos, &slack_candidates) {
                 queued = get_candidate(pos);
                 if (lt_before_eq(real_deadline(queued), real_deadline(task))) {
@@ -321,11 +253,8 @@ static void donate_slack(server_t *donator)
         server_t *slack = (server_t*)donator->data;
         hrt_server_t *hrt_server;
 
-        TRACE_SERVER_SUB(donator, "%llu slack donated", TIME(donator->budget));
-
         if (donator->type == S_HRT) {
                 hrt_server = container_of(donator, hrt_server_t, server);
-                BUG_ON(!hrt_server->ready);
         }
 
         slack->wcet = donator->budget;
@@ -345,20 +274,15 @@ static noinline void check_donate_slack(server_t *donator, struct task_struct *w
         hrt_server_t *hrt_server;
         int donate = 0;
 
-        TRACE_SERVER_SUB(donator, "checking donation");
-
         if (!slack)
                 return;
 
         /* Donating small amounts of slack will result in excess migrations */
-        if (donator->budget < SLACK_MIN)
+        if (donator->budget < SLACK_MIN || server_has_slack(donator))