BE servers now synchronize when task sets are released

2 files changed, 9 insertions, 11 deletions

diff --git a/litmus/dgl.c b/litmus/dgl.c
index 6c1267839123..2df27b48fcdf 100644
--- a/litmus/dgl.c
+++ b/litmus/dgl.c
@@ -166,7 +166,6 @@ static unsigned long try_acquire(struct dgl *dgl, struct dgl_resource *resource,
         }
 
         resource->free_replicas -= req->replicas;
-        BUG_ON(resource->free_replicas > dgl->num_replicas);
 
         TRACE("0x%p acquired %d replicas of rid %d\n",
               greq, req->replicas, rid);
diff --git a/litmus/sched_color.c b/litmus/sched_color.c
index 22c146014045..6c278f5d26cf 100644
--- a/litmus/sched_color.c
+++ b/litmus/sched_color.c
@@ -675,7 +675,6 @@ static long color_activate_plugin(void)
         struct rt_task tp;
         struct task_struct *server_task;
         struct cpu_entry *entry;
-        lt_t now = litmus_clock();
 
         for_each_online_cpu(cpu) {
                 entry = remote_entry(cpu);
@@ -699,17 +698,8 @@ static long color_activate_plugin(void)
                 tsk_rt(server_task)->task_params = tp;
                 tsk_rt(server_task)->present = 1;
 
-                /* Make runnable */
-                release_at(server_task, now);
-                entry->fifo_server.start_time = 0;
                 entry->scheduled = NULL;
 
-                cancel_enforcement_timer(&entry->fifo_server.timer);
-
-                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);
 
@@ -761,6 +751,15 @@ static void color_release_ts(lt_t time)
                 trace_litmus_server_param(stask->pid, fifo_cid,
                                           get_exec_cost(stask),
                                           get_rt_period(stask));
+
+                /* Make runnable */
+                release_at(stask, time);
+                entry->fifo_server.start_time = 0;
+
+                cancel_enforcement_timer(&entry->fifo_server.timer);
+
+                if (!is_queued(stask))
+                        requeue(&entry->rm_domain, stask);
         }
 }