state.c: fix warning

[lttv.git] / ltt / branches / poly / lttv / lttv / state.c

diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index 5bdfcebf40f3faa1f748d2bf9b62c1d6856b8c56..0bd17551626f91297a2adc6e436f5fc8867bc9ac 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -142,6 +142,7 @@ LttvCPUMode
   LTTV_CPU_IDLE,
   LTTV_CPU_BUSY,
   LTTV_CPU_IRQ,
+  LTTV_CPU_SOFT_IRQ,
   LTTV_CPU_TRAP;
 
 LttvIRQMode
@@ -1207,7 +1208,7 @@ static void lttv_state_free_irq_states(LttvIRQState *states, guint n)
 
 static LttvSoftIRQState *lttv_state_copy_soft_irq_states(LttvSoftIRQState *states, guint n)
 {
-  guint i,j;
+  guint i;
   LttvSoftIRQState *retval;
 
   retval = g_malloc(n*sizeof(LttvSoftIRQState));
@@ -1219,7 +1220,7 @@ static LttvSoftIRQState *lttv_state_copy_soft_irq_states(LttvSoftIRQState *state
   return retval;
 }
 
-static void lttv_state_free_soft_irq_states(LttvIRQState *states, guint n)
+static void lttv_state_free_soft_irq_states(LttvSoftIRQState *states, guint n)
 {
   g_free(states);
 }
@@ -1404,11 +1405,11 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
   }
 
   /* save the soft irq state */
-  nb_irqs = self->nb_irqs;
+  nb_soft_irqs = self->nb_soft_irqs;
   {
     value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_SOFT_IRQS,
         LTTV_POINTER);
-    *(value.v_pointer) = lttv_state_copy_soft_irq_states(self->soft_irq_states, nb_irqs);
+    *(value.v_pointer) = lttv_state_copy_soft_irq_states(self->soft_irq_states, nb_soft_irqs);
   }
 
   /* save the blkdev states */
@@ -2356,6 +2357,9 @@ static gboolean soft_irq_exit(void *hook_data, void *call_data)
   if(ts->soft_irq_states[softirq].running)
     ts->soft_irq_states[softirq].running--;
 
+  /* update cpu status */
+  cpu_pop_mode(s->cpu_state);
+
   return FALSE;
 }
 
@@ -2401,6 +2405,9 @@ static gboolean soft_irq_entry(void *hook_data, void *call_data)
   /* Do something with the info about being in user or system mode when int? */
   push_state(s, LTTV_STATE_SOFT_IRQ, submode);
 
+  /* update cpu status */
+  cpu_push_mode(s->cpu_state, LTTV_CPU_SOFT_IRQ);
+
   /* update softirq status */
   s->cpu_state->last_soft_irq = softirq;
   ts->soft_irq_states[softirq].running++;
@@ -3986,6 +3993,7 @@ static void module_init()
   LTTV_CPU_IDLE = g_quark_from_string("idle");
   LTTV_CPU_BUSY = g_quark_from_string("busy");
   LTTV_CPU_IRQ = g_quark_from_string("irq");
+  LTTV_CPU_SOFT_IRQ = g_quark_from_string("softirq");
   LTTV_CPU_TRAP = g_quark_from_string("trap");
 
   LTTV_IRQ_UNKNOWN = g_quark_from_string("unknown");