Merge branch 'wip-edf-hsb' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-edf-hsb

Conflicts:
	litmus/sched_edf_hsb.c

2 files changed, 11 insertions, 8 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 6d0e8a74e4ae..e5d5c5faa834 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -328,7 +328,7 @@ static void donate_slack(server_t *donator)
 /*
  * Donate any available slack from a server.
  */
-static void check_donate_slack(server_t *donator, struct task_struct *was_scheduled)
+static noinline void check_donate_slack(server_t *donator, struct task_struct *was_scheduled)
 {
         server_t *slack = server_slack(donator);
         hrt_server_t *hrt_server;
@@ -891,7 +891,7 @@ static inline void catchup_server(server_t *server, lt_t time)
         TRACE_SERVER_SUB(server, "catching up to %llu", time);
 }
 
-static int catchup_srt_server(struct task_struct *task)
+static noinline int catchup_srt_server(struct task_struct *task)
 {
         int jobs, rv = 0;
         lt_t release;
@@ -940,7 +940,7 @@ static int catchup_srt_server(struct task_struct *task)
  * Returns the next eligible slack server. This will remove any expired
  * slack servers still present in the list.
  */
-static server_t* next_eligible_slack_server(void)
+static noinline server_t* next_eligible_slack_server(void)
 {
         server_t *next_slack = NULL;
 
@@ -965,7 +965,7 @@ static server_t* next_eligible_slack_server(void)
  * Returns the next SRT task that is tardy or will be tardy. If none
  * are available, will return a tardy BE task if present.
  */
-static struct task_struct* next_eligible_slack(void)
+static noinline struct task_struct* next_eligible_slack(void)
 {
         struct task_struct *next = get_candidate(slack_candidates.next);
 
@@ -983,7 +983,7 @@ static struct task_struct* next_eligible_slack(void)
  * ineligible or there are no eligible jobs, returns NULL. This will re-release
  * any servers that are behind.
  */
-static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
+static noinline struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
 {
         lt_t now = litmus_clock();
         lt_t dead, slack, budget;
@@ -1066,7 +1066,7 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
 /*
  * This will catch up the SRT's server if it is behind.
  */
-static struct task_struct* next_eligible_srt(void)
+static noinline struct task_struct* next_eligible_srt(void)
 {
         int done = 0;
         struct task_struct *next_srt;
@@ -1122,9 +1122,9 @@ static noinline server_t* next_eligible_be_server(void)
                 bheap_delete(server_order, &be_ready_servers,
                              be_server->hn);
                 catchup_server(be_server, now);
+                check_donate_slack(be_server, NULL);
                 bheap_insert(server_order, &be_ready_servers,
                              be_server->hn);
-                check_donate_slack(be_server, NULL);
                 be_server = next_be_server();
                 TRACE_SERVER_SUB(be_server, "catching up BE server");
                 sched_trace_action(NULL, SERVER_RELEASED_ACTION); /* Release */
@@ -1813,6 +1813,7 @@ static void servers_released(struct list_head *servers)
                 list_del_init(pos);
 
                 if (server->type == S_BE) {
+                        check_donate_slack(server, NULL);
                         was_be = 1;
                         BUG_ON(bheap_node_in_heap(server->hn));
                         TRACE_SERVER_SUB(server, "inserting BE server");
diff --git a/litmus/sched_gsn_edf.c b/litmus/sched_gsn_edf.c
index c5c9600c33d8..2a649beed791 100644
--- a/litmus/sched_gsn_edf.c
+++ b/litmus/sched_gsn_edf.c
@@ -374,8 +374,10 @@ static struct task_struct* gsnedf_schedule(struct task_struct * prev)
         /* Bail out early if we are the release master.
          * The release master never schedules any real-time tasks.
          */
-        if (gsnedf.release_master == entry->cpu)
+        if (gsnedf.release_master == entry->cpu) {
+                sched_state_task_picked();
                 return NULL;
+        }
 #endif
 
         raw_spin_lock(&gsnedf_lock);