ignore

2 files changed, 22 insertions, 15 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 0dbfa26bcc44..d75f8a04b362 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -63,22 +63,21 @@
  * Useful debugging macros. Remove for actual use as they cause
  * a lot of lock contention.
  */
-#ifdef DEBUG_EDF_HSB
+//#ifdef DEBUG_EDF_HSB
 atomic_t servers_running = ATOMIC_INIT(0);
-#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("(%s/%d:%d) " fmt, (t)->comm, (t)->pid,         \
-              (t)->rt_param.job_params.job_no,  ##args)
-#define TRACE_SERVER_SUB(s, fmt, args...)       \
-        TRACE_SUB(SERVER_FMT " " fmt, SERVER_ARGS(s), ##args)
-#else
+/* #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("(%s/%d:%d) " fmt, (t)->comm, (t)->pid,         \ */
+/*            (t)->rt_param.job_params.job_no,  ##args) */
+/* #define TRACE_SERVER_SUB(s, fmt, args...)    \ */
+/*      TRACE_SUB(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...)
-#endif
-
+//#endif
 typedef enum {
         S_HRT,
         S_SRT,
@@ -482,7 +481,7 @@ static void slack_timer_arm(hrt_server_t *hrt_server)
                 return;
         }
 
-        if (when_to_fire >= hrt_server.server.deadline) {
+        if (when_to_fire >= hrt_server->server.deadline) {
                 TRACE_SUB("SHOULD BUG, deadline: %llu, budget: %llu",
                           hrt_server->server.deadline, hrt_server->server.budget);
                 return;
@@ -759,6 +758,9 @@ static inline rt_domain_t* get_rt_domain(cpu_entry_t *entry,
 static noinline void unlink(struct task_struct* t)
 {
         cpu_entry_t *entry;
+        rt_domain_t *domain;
+
+        BUG_ON(!t);
 
         if (t->rt_param.linked_on != NO_CPU) {
                 /* Unlink */
@@ -773,7 +775,11 @@ static noinline void unlink(struct task_struct* t)
                  * descheduled.
                  */
                 entry = task_sched_entry(t);
-                remove(get_rt_domain(entry, t), t);
+                domain = get_rt_domain(entry, t);
+                BUG_ON(!domain);
+                BUG_ON(!tsk_rt(t));
+                BUG_ON(!tsk_rt(t)->heap_node);
+                remove(domain, t);
         }
 }
 
diff --git a/litmus/servers.c b/litmus/servers.c
index 0b3f4b0eceb3..25d0970abbd0 100644
--- a/litmus/servers.c
+++ b/litmus/servers.c
@@ -13,7 +13,7 @@
 #include <litmus/sched_trace.h>
 #include <litmus/servers.h>
 
-#define DEBUG_SERVERS
+//#define DEBUG_SERVERS
 
 /*  Not working */
 /* #define COMPLETION_ON_MASTER */
@@ -59,6 +59,7 @@
 #define _TRACE_SUB(fmt, args...)
 #define TRACE_SUB(s, fmt, args...)
 #define TRACE_TIMER(s, fmt, args...)
+#define _TRACE_TIMER(fmt, args...)
 #endif
 
 /* Used to run a server on a remote CPU */