Wakeup change state only if proc not running (v2)

[lttv.git] / lttv / lttv / state.c

diff --git a/lttv/lttv/state.c b/lttv/lttv/state.c
index 7700b52ce0a0520e7d227747d8faa7ad4f1aba6e..938f23e4cd911ae52fc4f87d13f06f63d457a384 100644 (file)
--- a/lttv/lttv/state.c
+++ b/lttv/lttv/state.c
@@ -1494,7 +1494,6 @@ static void lttv_state_free_trap_states(LttvTrapState *states, guint n)
 static LttvBdevState *get_hashed_bdevstate(LttvTraceState *ts, guint32 devcode)
 {
        gint devcode_gint = devcode;
-       printf("get_hashed_bdevstate devcode %d\n", devcode_gint);
        gpointer bdev = g_hash_table_lookup(ts->bdev_states, &devcode_gint);
        if(bdev == NULL) {
                LttvBdevState *bdevstate = g_new(LttvBdevState, 1);
@@ -2766,7 +2765,6 @@ static gboolean bdev_request_issue(void *hook_data, void *call_data)
        guint oper = ltt_event_get_long_unsigned(e,
                        lttv_trace_get_hook_field(th, 2));
        guint32 devcode = MKDEV(major,minor);
-       printf("major %d minor %d oper %d devcode %d\n", major, minor, oper, devcode);
 
        /* have we seen this block device before? */
        gpointer bdev = get_hashed_bdevstate(ts, devcode);
@@ -2956,8 +2954,12 @@ static gboolean sched_try_wakeup(void *hook_data, void *call_data)
                        (LttvTraceState*)s->parent.t_context,
                        woken_cpu, woken_pid,
                        &s->parent.timestamp);
-       process->state->s = LTTV_STATE_WAIT_CPU;
-       process->state->change = s->parent.timestamp;
+
+       if (process->state->s == LTTV_STATE_WAIT || process->state->s == LTTV_STATE_WAIT_FORK)
+       {
+               process->state->s = LTTV_STATE_WAIT_CPU;
+               process->state->change = s->parent.timestamp;
+       }
 
        g_debug("Wakeup: process %d on CPU %u\n", woken_pid, woken_cpu);