disable schedchange test : not meaningful if there is missing information

[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 7fab470a5f5116437c2d44f56cf994ecdb3e7243..5b3fcf38a110ae9d22d8e24a324321ab7292c522 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -204,7 +204,7 @@ init(LttvTracesetState *self, LttvTraceset *ts)
   nb_trace = lttv_traceset_number(ts);
   for(i = 0 ; i < nb_trace ; i++) {
     tc = self->parent.traces[i];
-    tcs = (LttvTraceState *)tc;
+    tcs = LTTV_TRACE_STATE(tc);
     tcs->save_interval = LTTV_STATE_SAVE_INTERVAL;
     lttv_attribute_find(tcs->parent.t_a, LTTV_STATE_TRACE_STATE_USE_COUNT, 
         LTTV_UINT, &v);
@@ -372,7 +372,9 @@ static void copy_process_state(gpointer key, gpointer value,gpointer user_data)
   *new_process = *process;
   new_process->execution_stack = g_array_sized_new(FALSE, FALSE, 
       sizeof(LttvExecutionState), PREALLOCATED_EXECUTION_STACK);
-  g_array_set_size(new_process->execution_stack,process->execution_stack->len);
+  new_process->execution_stack = 
+              g_array_set_size(new_process->execution_stack,
+                  process->execution_stack->len);
   for(i = 0 ; i < process->execution_stack->len; i++) {
     g_array_index(new_process->execution_stack, LttvExecutionState, i) =
         g_array_index(process->execution_stack, LttvExecutionState, i);
@@ -436,9 +438,11 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
     *(value.v_uint) = tfcs->process->pid;
     value = lttv_attribute_add(tracefile_tree, LTTV_STATE_EVENT, 
         LTTV_POINTER);
-    LttEvent *e = ltt_tracefile_get_event(tfcs->parent.tf);
-    if(e == NULL) *(value.v_pointer) = NULL;
-    else {
+    /* Only save the position of the tfs is in the pqueue */
+    if(!g_tree_lookup(self->parent.ts_context->pqueue, &tfcs->parent)) {
+      *(value.v_pointer) = NULL;
+    } else {
+      LttEvent *e = ltt_tracefile_get_event(tfcs->parent.tf);
       ep = ltt_event_position_new();
       ltt_event_position(e, ep);
       *(value.v_pointer) = ep;
@@ -510,9 +514,13 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
     
     LttvTracefileContext *tfc = LTTV_TRACEFILE_CONTEXT(tfcs);
     
-    g_assert(ltt_tracefile_seek_position(tfc->tf, ep) == 0);
-    tfc->timestamp = ltt_event_time(ltt_tracefile_get_event(tfc->tf));
-    g_tree_insert(tsc->pqueue, tfc, tfc);
+    if(ep != NULL) {
+      g_assert(ltt_tracefile_seek_position(tfc->tf, ep) == 0);
+      tfc->timestamp = ltt_event_time(ltt_tracefile_get_event(tfc->tf));
+      g_tree_insert(tsc->pqueue, tfc, tfc);
+    } else {
+      tfc->timestamp = ltt_time_infinite;
+    }
   }
 }
 
@@ -642,7 +650,7 @@ create_name_tables(LttvTraceState *tcs)
 
   GQuark f_name, e_name;
 
-  LttvTraceHook *h;
+  LttvTraceHook h;
 
   LttvTraceHookByFacility *thf;
 
@@ -675,15 +683,15 @@ create_name_tables(LttvTraceState *tcs)
   if(lttv_trace_find_hook(tcs->parent.t,
       LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
       LTT_FIELD_SYSCALL_ID, 0, 0,
-      NULL, h))
+      NULL, &h))
     return;
   
-  thf = lttv_trace_hook_get_first(h);
+  thf = lttv_trace_hook_get_first(&h);
   
   t = ltt_field_type(thf->f1);
   nb = ltt_type_element_number(t);
   
-  lttv_trace_hook_destroy(h);
+  lttv_trace_hook_destroy(&h);
 
   /* CHECK syscalls should be an enum but currently are not!  
   name_tables->syscall_names = g_new(GQuark, nb);
@@ -703,15 +711,15 @@ create_name_tables(LttvTraceState *tcs)
   if(lttv_trace_find_hook(tcs->parent.t, LTT_FACILITY_KERNEL,
         LTT_EVENT_TRAP_ENTRY,
         LTT_FIELD_TRAP_ID, 0, 0,
-        NULL, h))
+        NULL, &h))
     return;
 
-  thf = lttv_trace_hook_get_first(h);
+  thf = lttv_trace_hook_get_first(&h);
 
   t = ltt_field_type(thf->f1);
   nb = ltt_type_element_number(t);
 
-  lttv_trace_hook_destroy(h);
+  lttv_trace_hook_destroy(&h);
 
   /*
   name_tables->trap_names = g_new(GQuark, nb);
@@ -730,15 +738,15 @@ create_name_tables(LttvTraceState *tcs)
   if(lttv_trace_find_hook(tcs->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
         LTT_FIELD_IRQ_ID, 0, 0,
-        NULL, h))
+        NULL, &h))
     return;
   
-  thf = lttv_trace_hook_get_first(h);
+  thf = lttv_trace_hook_get_first(&h);
   
   t = ltt_field_type(thf->f1);
   nb = ltt_type_element_number(t);
 
-  lttv_trace_hook_destroy(h);
+  lttv_trace_hook_destroy(&h);
 
   /*
   name_tables->irq_names = g_new(GQuark, nb);
@@ -794,7 +802,6 @@ free_name_tables(LttvTraceState *tcs)
   g_free(name_tables);
 } 
 
-
 static void push_state(LttvTracefileState *tfs, LttvExecutionMode t, 
     guint state_id)
 {
@@ -804,7 +811,12 @@ static void push_state(LttvTracefileState *tfs, LttvExecutionMode t,
 
   guint depth = process->execution_stack->len;
 
-  g_array_set_size(process->execution_stack, depth + 1);
+  process->execution_stack = 
+    g_array_set_size(process->execution_stack, depth + 1);
+  /* Keep in sync */
+  process->state =
+    &g_array_index(process->execution_stack, LttvExecutionState, depth - 1);
+    
   es = &g_array_index(process->execution_stack, LttvExecutionState, depth);
   es->t = t;
   es->n = state_id;
@@ -840,7 +852,8 @@ static void pop_state(LttvTracefileState *tfs, LttvExecutionMode t)
     return;
   }
 
-  g_array_set_size(process->execution_stack, depth - 1);
+  process->execution_stack = 
+    g_array_set_size(process->execution_stack, depth - 1);
   process->state = &g_array_index(process->execution_stack, LttvExecutionState,
       depth - 2);
   process->state->change = tfs->parent.timestamp;
@@ -894,7 +907,7 @@ lttv_state_create_process(LttvTracefileState *tfs, LttvProcessState *parent,
   process->last_cpu_index = ((LttvTracefileContext*)tfs)->index;
   process->execution_stack = g_array_sized_new(FALSE, FALSE, 
       sizeof(LttvExecutionState), PREALLOCATED_EXECUTION_STACK);
-  g_array_set_size(process->execution_stack, 1);
+  process->execution_stack = g_array_set_size(process->execution_stack, 1);
   es = process->state = &g_array_index(process->execution_stack, 
       LttvExecutionState, 0);
   es->t = LTTV_STATE_USER_MODE;
@@ -1066,9 +1079,11 @@ static gboolean schedchange(void *hook_data, void *call_data)
        is missing. It is not obvious how we could, after the fact, compensate
        the wrongly attributed statistics. */
 
-    if(unlikely(s->process->pid != pid_out)) {
-      g_assert(s->process->pid == 0);
-    }
+    //This test only makes sense once the state is known and if there is no
+    //missing events.
+    //if(unlikely(s->process->pid != pid_out)) {
+    //  g_assert(s->process->pid == 0);
+    //}
 
     if(unlikely(s->process->state->s == LTTV_STATE_EXIT)) {
       s->process->state->s = LTTV_STATE_ZOMBIE;
@@ -1206,7 +1221,7 @@ void lttv_state_add_event_hooks(LttvTracesetState *self)
        associated by id hooks. */
 
     hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 10);
-    g_array_set_size(hooks, 10);
+    hooks = g_array_set_size(hooks, 10);
 
     ret = lttv_trace_find_hook(ts->parent.t,
         LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
@@ -1347,9 +1362,10 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self)
                     thf->h,
                     thf);
         }
-        lttv_trace_hook_destroy(&g_array_index(hooks, LttvTraceHook, k));
       }
     }
+    for(k = 0 ; k < hooks->len ; k++)
+      lttv_trace_hook_destroy(&g_array_index(hooks, LttvTraceHook, k));
     g_array_free(hooks, TRUE);
   }
 }