Fixed sched_trace records for state transitions.

This commit is dirty and will be cleaned up when blocking states are tested.

1 files changed, 32 insertions, 22 deletions

diff --git a/litmus/server.c b/litmus/server.c
index 3ff48e8316a6..6e713a24fd33 100644
--- a/litmus/server.c
+++ b/litmus/server.c
@@ -13,9 +13,9 @@
 
 #define server_job(s) ((s)->job ? *(s)->job : 0)
 #define trace_switch(s, type) sched_trace_server_switch_ ##type (       \
-        (s)->cpu, 0, (s)->sid, server_job(s))
+        (s)->parent, 0, (s)->sid, server_job(s), *(s)->cpu)
 #define trace_transition(s, type)                                       \
-        sched_trace_server_switch_ ##type(0, 0, (s)->sid, server_job(s))
+        sched_trace_server_switch_ ##type(0, 0, (s)->sid, server_job(s), *(s)->cpu)
 
 #define NCS(x) case x: return #x
 
@@ -29,12 +29,13 @@ static const char* server_state_name(enum server_state state)
         }
 }
 
-void server_init(struct server *server, int sid, int *job)
+void server_init(struct server *server, int sid, int *job, int *cpu)
 {
         server->sid = sid;
         server->job = job;
 
-        server->cpu = 0;
+        server->cpu = cpu;
+        server->parent = 0;
         server->state = SS_REMOVED;
         server->linked = 0;
         server->in_transit = 0;
@@ -43,38 +44,45 @@ void server_init(struct server *server, int sid, int *job)
 void server_state_change(struct server *server, enum server_state state,
                          unsigned int transit)
 {
+        enum server_state last = server->state;
+
         if (!server->in_transit && transit &&
-            server->state == state)
+            server->state == state) {
+                STRACE("Ignoring transit state when target same\n");
                 return;
-        if (server->in_transit == transit && state == server->state)
+        }
+        if (server->in_transit == transit && state == server->state) {
+                STRACE("Ignoring identical change\n");
                 return;
-
-        if (server->in_transit && transit) {
-                sched_trace_server_completion(server->sid, 0);
-                goto set_state;
         }
 
         if (server->in_transit) {
+                STRACE("Transition end\n");
                 trace_transition(server, away);
-        } else {
-                switch (server->state) {
-                case SS_BLOCKED:
-                        sched_trace_server_resume(server->sid);
-                        break;
-                case SS_ACTIVE:
-                        trace_switch(server, away);
-                        break;
-                }
+                last = server->last;
+        }
+
+        if (server->state == SS_BLOCKED) {
+                STRACE("Server resume\n");
+                sched_trace_server_resume(server->sid);
         }
 
         if (transit) {
+                STRACE("Transition begin\n");
                 trace_transition(server, to);
         } else {
+                if (last == SS_ACTIVE) {
+                        STRACE("Switch from server\n");
+                        trace_switch(server, away);
+                }
+
                 switch (state) {
                 case SS_BLOCKED:
+                        STRACE("Server block\n");
                         sched_trace_server_block(server->sid);
                         break;
                 case SS_ACTIVE:
+                        STRACE("Switch to server\n");
                         trace_switch(server, to);
                         break;
                 }
@@ -82,11 +90,13 @@ void server_state_change(struct server *server, enum server_state state,
 
  set_state:
 #ifdef CONFIG_PREEMPT_STATE_TRACE
-        STRACE("server: %d - (%s:%d)->(%s:%d)\n",
-               server->sid,
+        STRACE("server: %d (parent: %d, cpu: %d, job: %d) - (%s:%d)->(%s:%d) at %llu\n",
+               server->sid, server->parent, *server->cpu, (server->job) ? *server->job : 0,
                server_state_name(server->state), server->in_transit,
-               server_state_name(state), transit);
+               server_state_name(state), transit,
+               litmus_clock());
 #endif
+        server->last = server->state;
         server->state = state;
         server->in_transit = transit;
 }