Removed repetitive calls to litmus_clock(), which will sometimes cause abnormal behavior.

1 files changed, 4 insertions, 5 deletions

diff --git a/litmus/sched_edf_hsb.c b/litmus/sched_edf_hsb.c
index 78f371ee8941..ec4d6b0b27c2 100644
--- a/litmus/sched_edf_hsb.c
+++ b/litmus/sched_edf_hsb.c
@@ -565,11 +565,10 @@ static inline lt_t lt_subtract(lt_t a, lt_t b)
                 return 0;
 }
 
-static void requeue_server(server_t *server)
+static void requeue_server(server_t *server, lt_t now)
 {
         int added = 0;
         hrt_server_t *hrt_server;
-        lt_t now = litmus_clock();
 
         BUG_ON(server->type == S_SRT ||
                server->type == S_SLACK);
@@ -581,7 +580,7 @@ static void requeue_server(server_t *server)
         if (!added) {
                 /* Mark servers as released */
                 if (server->type == S_HRT) {
-                        TRACE_SERVER_SUB(server, "P%d now ready");
+                        TRACE_SERVER_SUB(server, "P%d now ready at %llu", now);
                         hrt_server = container_of(server, hrt_server_t, server);
                         hrt_server->ready = 1;
                 } else if (server->type == S_BE) {
@@ -688,7 +687,7 @@ static noinline void unlink_server(cpu_entry_t *entry, int requeue)
                 /* Donator needs to absorb slack execution time */
                 reclaim_slack(server);
         } else if (server->type != S_SRT) {
-                requeue_server(server);
+                requeue_server(server, litmus_clock());
         }
 
         if (server->type == S_HRT && hrt_server->ready)
@@ -1024,7 +1023,7 @@ static struct task_struct* next_eligible_hrt(hrt_server_t *hrt_server)
                 if (!hrt_server->server.budget &&
                     !head_in_list(&hrt_server->server.release_list)) {
                         TRACE_SERVER_SUB(&hrt_server->server, "requeing");
-                        requeue_server(&hrt_server->server);
+                        requeue_server(&hrt_server->server, now);
                 }
 
                 if (task) {