X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.c;h=3ef8a2162318cbaa26a82aae9ec39cd35d6f833d;hb=a81d2a59d85b15507a64cc2e8cc53b7be4330fdc;hp=5bdfcebf40f3faa1f748d2bf9b62c1d6856b8c56;hpb=0305fe774206ec12a98378be3cf891446b1b901c;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index 5bdfcebf..3ef8a216 100644
--- 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
@@ -171,6 +172,7 @@ static GQuark
   LTTV_STATE_RESOURCE_CPUS_COUNT,
   LTTV_STATE_RESOURCE_IRQS,
   LTTV_STATE_RESOURCE_SOFT_IRQS,
+  LTTV_STATE_RESOURCE_TRAPS,
   LTTV_STATE_RESOURCE_BLKDEVS;
 
 static void create_max_time(LttvTraceState *tcs);
@@ -262,7 +264,7 @@ gboolean rettrue(gpointer key, gpointer value, gpointer user_data)
 static void
 restore_init_state(LttvTraceState *self)
 {
-  guint i, nb_cpus, nb_irqs, nb_soft_irqs;
+  guint i, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
 
   //LttvTracefileState *tfcs;
 
@@ -289,6 +291,7 @@ restore_init_state(LttvTraceState *self)
   nb_cpus = ltt_trace_get_num_cpu(self->parent.t);
   nb_irqs = self->nb_irqs;
   nb_soft_irqs = self->nb_soft_irqs;
+  nb_traps = self->nb_traps;
   
   /* Put the per cpu running_process to beginning state : process 0. */
   for(i=0; i< nb_cpus; i++) {
@@ -324,6 +327,11 @@ restore_init_state(LttvTraceState *self)
     self->soft_irq_states[i].running = 0;
   }
 
+  /* reset trap states */
+  for(i=0; i<nb_traps; i++) {
+    self->trap_states[i].running = 0;
+  }
+
   /* reset bdev states */
   g_hash_table_foreach(self->bdev_states, bdevstate_free_cb, NULL);
   //g_hash_table_steal_all(self->bdev_states);
@@ -497,6 +505,9 @@ init(LttvTracesetState *self, LttvTraceset *ts)
     /* the kernel has a statically fixed max of 32 softirqs */
     tcs->soft_irq_states = g_new(LttvSoftIRQState, tcs->nb_soft_irqs);
 
+    /* init trap stuff */
+    tcs->trap_states = g_new(LttvTrapState, tcs->nb_traps);
+
     /* init bdev resource stuff */
     tcs->bdev_states = g_hash_table_new(g_int_hash, g_int_equal);
 
@@ -1207,7 +1218,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 +1230,26 @@ 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);
+}
+
+static LttvTrapState *lttv_state_copy_trap_states(LttvTrapState *states, guint n)
+{
+  guint i;
+  LttvTrapState *retval;
+
+  retval = g_malloc(n*sizeof(LttvTrapState));
+
+  for(i=0; i<n; i++) {
+    retval[i].running = states[i].running;
+  }
+
+  return retval;
+}
+
+static void lttv_state_free_trap_states(LttvTrapState *states, guint n)
 {
   g_free(states);
 }
@@ -1315,7 +1345,7 @@ static void lttv_state_free_blkdev_hashtable(GHashTable *ht)
 
 static void state_save(LttvTraceState *self, LttvAttribute *container)
 {
-  guint i, nb_tracefile, nb_cpus, nb_irqs;
+  guint i, nb_tracefile, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
 
   LttvTracefileState *tfcs;
 
@@ -1404,11 +1434,19 @@ 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 trap state */
+  nb_traps = self->nb_traps;
+  {
+    value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_TRAPS,
+        LTTV_POINTER);
+    *(value.v_pointer) = lttv_state_copy_trap_states(self->trap_states, nb_traps);
   }
 
   /* save the blkdev states */
@@ -1420,7 +1458,7 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
 
 static void state_restore(LttvTraceState *self, LttvAttribute *container)
 {
-  guint i, nb_tracefile, pid, nb_cpus, nb_irqs, nb_soft_irqs;
+  guint i, nb_tracefile, pid, nb_cpus, nb_irqs, nb_soft_irqs, nb_traps;
 
   LttvTracefileState *tfcs;
 
@@ -1486,6 +1524,13 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
   lttv_state_free_soft_irq_states(self->soft_irq_states, nb_soft_irqs);
   self->soft_irq_states = lttv_state_copy_soft_irq_states(*(value.v_pointer), nb_soft_irqs);
  
+  /* restore trap resource states */
+  nb_traps = self->nb_traps;
+  type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_TRAPS, &value);
+  g_assert(type == LTTV_POINTER);
+  lttv_state_free_trap_states(self->trap_states, nb_traps);
+  self->trap_states = lttv_state_copy_trap_states(*(value.v_pointer), nb_traps);
+ 
   /* restore the blkdev states */
   type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
   g_assert(type == LTTV_POINTER);
@@ -2269,6 +2314,7 @@ static gboolean syscall_exit(void *hook_data, void *call_data)
 static gboolean trap_entry(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
+  LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
   LttEvent *e = ltt_tracefile_get_event(s->parent.tf);
   LttvTraceHook *th = (LttvTraceHook *)hook_data;
   struct marker_field *f = lttv_trace_get_hook_field(th, 0);
@@ -2293,18 +2339,28 @@ static gboolean trap_entry(void *hook_data, void *call_data)
   /* update cpu status */
   cpu_push_mode(s->cpu_state, LTTV_CPU_TRAP);
 
+  /* update trap status */
+  s->cpu_state->last_trap = trap;
+  ts->trap_states[trap].running++;
+
   return FALSE;
 }
 
 static gboolean trap_exit(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
+  LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
+  guint trap = s->cpu_state->last_trap;
 
   pop_state(s, LTTV_STATE_TRAP);
 
   /* update cpu status */
   cpu_pop_mode(s->cpu_state);
 
+  /* update trap status */
+  if(ts->trap_states[trap].running)
+    ts->trap_states[trap].running--;
+
   return FALSE;
 }
 
@@ -2356,6 +2412,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 +2460,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++;
@@ -3922,6 +3984,7 @@ static void module_init()
   LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu count");
   LTTV_STATE_RESOURCE_IRQS = g_quark_from_string("irq resource states");
   LTTV_STATE_RESOURCE_SOFT_IRQS = g_quark_from_string("soft irq resource states");
+  LTTV_STATE_RESOURCE_TRAPS = g_quark_from_string("trap resource states");
   LTTV_STATE_RESOURCE_BLKDEVS = g_quark_from_string("blkdevs resource states");
 
   
@@ -3986,6 +4049,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");