X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Flttv%2Fstate.c;h=61677fa8f4b8a57d0d1ffe41a76485224656f19f;hb=d34141ca6fc6dd872a922134b22095bd74ec013d;hp=b15c616847d77276471919f5f1808a1eab055ac7;hpb=f61bce48a06a0a3516941ba31b73982d45da0f9e;p=lttv.git

diff --git a/ltt/branches/poly/lttv/lttv/state.c b/ltt/branches/poly/lttv/lttv/state.c
index b15c6168..61677fa8 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
@@ -170,6 +171,7 @@ static GQuark
   LTTV_STATE_RESOURCE_CPUS,
   LTTV_STATE_RESOURCE_CPUS_COUNT,
   LTTV_STATE_RESOURCE_IRQS,
+  LTTV_STATE_RESOURCE_SOFT_IRQS,
   LTTV_STATE_RESOURCE_BLKDEVS;
 
 static void create_max_time(LttvTraceState *tcs);
@@ -253,12 +255,15 @@ static void lttv_state_free_usertraces(GHashTable *usertraces)
   g_hash_table_destroy(usertraces);
 }
 
-
+gboolean rettrue(gpointer key, gpointer value, gpointer user_data)
+{
+	return TRUE;
+}
 
 static void
 restore_init_state(LttvTraceState *self)
 {
-  guint i, nb_cpus, nb_irqs;
+  guint i, nb_cpus, nb_irqs, nb_soft_irqs;
 
   //LttvTracefileState *tfcs;
 
@@ -284,6 +289,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;
   
   /* Put the per cpu running_process to beginning state : process 0. */
   for(i=0; i< nb_cpus; i++) {
@@ -314,9 +320,15 @@ restore_init_state(LttvTraceState *self)
       g_array_remove_range(self->irq_states[i].mode_stack, 0, self->irq_states[i].mode_stack->len);
   }
 
+  /* reset softirq states */
+  for(i=0; i<nb_soft_irqs; i++) {
+    self->soft_irq_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);
+  //g_hash_table_steal_all(self->bdev_states);
+  g_hash_table_foreach_steal(self->bdev_states, rettrue, NULL);
   
 #if 0
   nb_tracefile = self->parent.tracefiles->len;
@@ -482,6 +494,10 @@ init(LttvTracesetState *self, LttvTraceset *ts)
       g_assert(tcs->irq_states[j].mode_stack != NULL);
     } 
 
+    /* init soft irq stuff */
+    /* the kernel has a statically fixed max of 32 softirqs */
+    tcs->soft_irq_states = g_new(LttvSoftIRQState, tcs->nb_soft_irqs);
+
     /* init bdev resource stuff */
     tcs->bdev_states = g_hash_table_new(g_int_hash, g_int_equal);
 
@@ -1155,7 +1171,7 @@ static void lttv_state_free_cpu_states(LttvCPUState *states, guint n)
   guint i;
 
   for(i=0; i<n; i++) {
-    g_array_free(states[i].mode_stack, FALSE);
+    g_array_free(states[i].mode_stack, TRUE);
   }
 
   g_free(states);
@@ -1184,9 +1200,28 @@ static void lttv_state_free_irq_states(LttvIRQState *states, guint n)
   guint i;
 
   for(i=0; i<n; i++) {
-    g_array_free(states[i].mode_stack, FALSE);
+    g_array_free(states[i].mode_stack, TRUE);
+  }
+
+  g_free(states);
+}
+
+static LttvSoftIRQState *lttv_state_copy_soft_irq_states(LttvSoftIRQState *states, guint n)
+{
+  guint i,j;
+  LttvSoftIRQState *retval;
+
+  retval = g_malloc(n*sizeof(LttvSoftIRQState));
+
+  for(i=0; i<n; i++) {
+    retval[i].running = states[i].running;
   }
 
+  return retval;
+}
+
+static void lttv_state_free_soft_irq_states(LttvIRQState *states, guint n)
+{
   g_free(states);
 }
 
@@ -1221,7 +1256,7 @@ static LttvBdevState *bdevstate_new(void)
 
 static void bdevstate_free(LttvBdevState *bds)
 {
-  g_array_free(bds->mode_stack, FALSE);
+  g_array_free(bds->mode_stack, TRUE);
   g_free(bds);
 }
 
@@ -1369,6 +1404,14 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
     *(value.v_pointer) = lttv_state_copy_irq_states(self->irq_states, nb_irqs);
   }
 
+  /* save the soft irq state */
+  nb_irqs = self->nb_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);
+  }
+
   /* save the blkdev states */
   value = lttv_attribute_add(container, LTTV_STATE_RESOURCE_BLKDEVS,
         LTTV_POINTER);
@@ -1378,7 +1421,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;
+  guint i, nb_tracefile, pid, nb_cpus, nb_irqs, nb_soft_irqs;
 
   LttvTracefileState *tfcs;
 
@@ -1437,6 +1480,13 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
   lttv_state_free_irq_states(self->irq_states, nb_irqs);
   self->irq_states = lttv_state_copy_irq_states(*(value.v_pointer), nb_irqs);
  
+  /* restore soft irq resource states */
+  nb_soft_irqs = self->nb_soft_irqs;
+  type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_SOFT_IRQS, &value);
+  g_assert(type == LTTV_POINTER);
+  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 the blkdev states */
   type = lttv_attribute_get_by_name(container, LTTV_STATE_RESOURCE_BLKDEVS, &value);
   g_assert(type == LTTV_POINTER);
@@ -1751,9 +1801,10 @@ create_name_tables(LttvTraceState *tcs)
   }
   */
 
-  name_tables->nb_softirqs = 256;
-  name_tables->soft_irq_names = g_new(GQuark, 256);
-  for(i = 0 ; i < 256 ; i++) {
+  /* the kernel is limited to 32 statically defined softirqs */
+  name_tables->nb_softirqs = 32;
+  name_tables->soft_irq_names = g_new(GQuark, name_tables->nb_softirqs);
+  for(i = 0 ; i < name_tables->nb_softirqs ; i++) {
     g_string_printf(fe_name, "softirq %d", i);
     name_tables->soft_irq_names[i] = g_quark_from_string(fe_name->str);
   }
@@ -1782,7 +1833,7 @@ get_name_tables(LttvTraceState *tcs)
   tcs->irq_names = name_tables->irq_names;
   tcs->soft_irq_names = name_tables->soft_irq_names;
   tcs->nb_irqs = name_tables->nb_irqs;
-  tcs->nb_softirqs = name_tables->nb_softirqs;
+  tcs->nb_soft_irqs = name_tables->nb_softirqs;
 }
 
 
@@ -2139,7 +2190,7 @@ lttv_state_find_process_or_create(LttvTraceState *ts, guint cpu, guint pid,
  * the parent waits for its child terminaison, but may also happen in special
  * cases in the child's exit : when the parent ignores its children SIGCCHLD or
  * has the flag SA_NOCLDWAIT. It can also happen when the child is part
- * of a killed thread ground, but isn't the leader.
+ * of a killed thread group, but isn't the leader.
  */
 static void exit_process(LttvTracefileState *tfs, LttvProcessState *process) 
 {
@@ -2297,12 +2348,20 @@ static gboolean irq_entry(void *hook_data, void *call_data)
 static gboolean soft_irq_exit(void *hook_data, void *call_data)
 {
   LttvTracefileState *s = (LttvTracefileState *)call_data;
+  LttvTraceState *ts = (LttvTraceState *)s->parent.t_context;
+  guint softirq = s->cpu_state->last_soft_irq;
 
   pop_state(s, LTTV_STATE_SOFT_IRQ);
-  return FALSE;
-}
 
+  /* update softirq status */
+  if(ts->soft_irq_states[softirq].running)
+    ts->soft_irq_states[softirq].running--;
+
+  /* update cpu status */
+  cpu_pop_mode(s->cpu_state);
 
+  return FALSE;
+}
 
 static gboolean irq_exit(void *hook_data, void *call_data)
 {
@@ -2323,6 +2382,7 @@ static gboolean irq_exit(void *hook_data, void *call_data)
 static gboolean soft_irq_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);
   //guint8 ev_id = ltt_event_eventtype_id(e);
   LttvTraceHook *th = (LttvTraceHook *)hook_data;
@@ -2330,7 +2390,7 @@ static gboolean soft_irq_entry(void *hook_data, void *call_data)
 
   LttvExecutionSubmode submode;
   guint64 softirq = ltt_event_get_long_unsigned(e, f);
-  guint64 nb_softirqs = ((LttvTraceState *)(s->parent.t_context))->nb_softirqs;
+  guint64 nb_softirqs = ((LttvTraceState *)(s->parent.t_context))->nb_soft_irqs;
 
   if(softirq < nb_softirqs) {
     submode = ((LttvTraceState *)(s->parent.t_context))->soft_irq_names[softirq];
@@ -2344,6 +2404,14 @@ 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++;
+
   return FALSE;
 }
 
@@ -2546,7 +2614,7 @@ static gboolean schedchange(void *hook_data, void *call_data)
         process->state->change = s->parent.timestamp;
       }
       
-      if(state_out == 32 || state_out == 128)
+      if(state_out == 32 || state_out == 64)
          exit_process(s, process); /* EXIT_DEAD || TASK_DEAD */
             /* see sched.h for states */
     }
@@ -2565,9 +2633,18 @@ static gboolean schedchange(void *hook_data, void *call_data)
 
   /* update cpu status */
   if(pid_in == 0)
+    /* going to idle task */
     cpu_set_base_mode(s->cpu_state, LTTV_CPU_IDLE);
-  else
+  else {
+    /* scheduling a real task.
+     * we must be careful here:
+     * if we just schedule()'ed to a process that is
+     * in a trap, we must put the cpu in trap mode
+     */
     cpu_set_base_mode(s->cpu_state, LTTV_CPU_BUSY);
+    if(process->state->t == LTTV_STATE_TRAP)
+      cpu_push_mode(s->cpu_state, LTTV_CPU_TRAP);
+  }
 
   return FALSE;
 }
@@ -3851,6 +3928,7 @@ static void module_init()
   LTTV_STATE_RESOURCE_CPUS = g_quark_from_string("cpu resource states");
   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_BLKDEVS = g_quark_from_string("blkdevs resource states");
 
   
@@ -3915,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");