Finer-grained fifo locking

2 files changed, 10 insertions, 8 deletions

diff --git a/include/litmus/color.h b/include/litmus/color.h
index 03524692511a..970585927145 100644
--- a/include/litmus/color.h
+++ b/include/litmus/color.h
@@ -1,9 +1,6 @@
 #ifndef LITMUS_COLOR_H
 #define LITMUS_COLOR_H
 
-#define NUM_COLORS 64
-#define NUM_WAYS   12
-
 #ifdef __KERNEL__
 
 #define ONE_COLOR_LEN 11
diff --git a/litmus/sched_color.c b/litmus/sched_color.c
index f6115e552cf8..29516e948749 100644
--- a/litmus/sched_color.c
+++ b/litmus/sched_color.c
@@ -60,6 +60,7 @@ static raw_spinlock_t dgl_lock;
 #define has_resources(t, c)    (tsk_rt(t)->req == group_lock.acquired[c])
 #define task_dom(entry, task)  (is_be(task) ? &fifo_domain : &entry->rm_domain)
 #define task_lock(entry, task) (is_be(task) ? &fifo_lock   : entry_lock(entry))
+#define is_fifo_server(s)      (s->sid > num_online_cpus())
 
 /*
  * Requeue onto domain's release or ready queue based on task state.
@@ -188,9 +189,7 @@ static void link(struct rt_server *server, struct task_struct *task)
         if (is_server(task)) {
                 tserv = task_fserver(task);
                 tserv->running = 1;
-                raw_spin_lock(&fifo_lock);
                 schedule_server(tserv);
-                raw_spin_unlock(&fifo_lock);
         }
 
         server->linked = task;
@@ -256,6 +255,7 @@ static struct task_struct* schedule_server(struct rt_server *server)
 {
         struct task_struct *next;
         struct rt_server *lserver;
+        int is_fifo = is_fifo_server(server);
 
         TRACE("Scheduling server %d\n", server->sid);
 
@@ -268,16 +268,20 @@ static struct task_struct* schedule_server(struct rt_server *server)
         }
 
         next = server->linked;
+        if (is_fifo)
+                raw_spin_lock(&fifo_lock);
         if ((!next || !is_np(next)) &&
              server->need_preempt(server->domain, next)) {
                 if (next) {
                         TRACE_TASK(next, "Preempted\n");
                         unlink(server);
-                        server->requeue(server, next);
+                        requeue(server->domain, next);
                 }
                 next = __take_ready(server->domain);
                 link(server, next);
         }
+        if (is_fifo)
+                raw_spin_unlock(&fifo_lock);
 
         return next;
 }
@@ -346,9 +350,7 @@ static void fifo_update(struct rt_server *server)
                 }
 
                 /* Calculate next task */
-                raw_spin_lock(&fifo_lock);
                 schedule_server(&fserver->server);
-                raw_spin_unlock(&fifo_lock);
 
                 /* Reserve needed resources */
                 raw_spin_lock(&dgl_lock);
@@ -449,7 +451,9 @@ static struct task_struct* color_schedule(struct task_struct *prev)
 
         if (entry->scheduled && cpu_empty(entry, plink) && is_running(prev)) {
                 TRACE_TASK(prev, "Snuck in on new!\n");
+                raw_spin_lock(&fifo_lock);
                 requeue(task_dom(entry, prev), prev);
+                raw_spin_unlock(&fifo_lock);
         }
 
         /* Pick next top-level task */
@@ -693,6 +697,7 @@ static long color_activate_plugin(void)
                 if (!is_queued(server_task))
                         requeue(&entry->rm_domain, server_task);
 
+
                 TRACE_TASK(server_task, "Created server with wcet: %llu, "
                            "period: %llu\n", tp.exec_cost, tp.period);