batchtest partially working

[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 e8eb3db4c74b578f58322f88d9301df5e5ed1896..274d5f4808cb3db7d58b90521ff08bcc44616e10 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/state.c
+++ b/ltt/branches/poly/lttv/lttv/state.c
@@ -172,8 +172,8 @@ restore_init_state(LttvTraceState *self)
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs =
-      LTTV_TRACEFILE_STATE(&g_array_index(self->parent.tracefiles,
-                                          LttvTracefileContext, i));
+      LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
     ltt_trace_time_span_get(self->parent.t, &tfcs->parent.timestamp, NULL);
 //    tfcs->saved_position = 0;
     tfcs->process = lttv_state_create_process(tfcs, NULL,0);
@@ -221,8 +221,8 @@ init(LttvTracesetState *self, LttvTraceset *ts)
 
     for(j = 0 ; j < nb_tracefile ; j++) {
       tfcs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(tc->tracefiles,
-                                          LttvTracefileContext, j));
+          LTTV_TRACEFILE_STATE(g_array_index(tc->tracefiles,
+                                          LttvTracefileContext*, j));
       tfcs->cpu_name = ltt_tracefile_name(tfcs->parent.tf);
     }
     tcs->processes = NULL;
@@ -338,8 +338,8 @@ void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp)
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(self->parent.tracefiles,
-                                          LttvTracefileContext, i));
+          LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
     fprintf(fp, "  <TRACEFILE PID=%u TIMESTAMP_S=%lu TIMESTAMP_NS=%lu", 
         tfcs->process->pid, tfcs->parent.timestamp.tv_sec, 
         tfcs->parent.timestamp.tv_nsec);
@@ -348,7 +348,7 @@ void lttv_state_write(LttvTraceState *self, LttTime t, FILE *fp)
     else {
       ltt_event_position(e, ep);
       ltt_event_position_get(ep, &tf, &nb_block, &offset, &tsc);
-      fprintf(fp, " BLOCK=%lu OFFSET=%lu TSC=%llu/>\n", nb_block, offset,
+      fprintf(fp, " BLOCK=%u OFFSET=%u TSC=%llu/>\n", nb_block, offset,
           tsc);
     }
   }
@@ -425,8 +425,8 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(self->parent.tracefiles,
-                                          LttvTracefileContext, i));
+          LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
     tracefile_tree = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL);
     value = lttv_attribute_add(tracefiles_tree, i, 
         LTTV_GOBJECT);
@@ -447,7 +447,7 @@ static void state_save(LttvTraceState *self, LttvAttribute *container)
       guint64 tsc;
       LttTracefile *tf;
       ltt_event_position_get(ep, &tf, &nb_block, &offset, &tsc);
-      g_debug("Block %lu offset %lu tsc %llu time %lu.%lu", nb_block, offset,
+      g_debug("Block %u offset %u tsc %llu time %lu.%lu", nb_block, offset,
           tsc,
           tfcs->parent.timestamp.tv_sec, tfcs->parent.timestamp.tv_nsec);
     }
@@ -471,6 +471,8 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
 
   LttEventPosition *ep;
 
+  LttvTracesetContext *tsc = self->parent.ts_context;
+
   tracefiles_tree = lttv_attribute_find_subdir(container, 
       LTTV_STATE_TRACEFILES);
 
@@ -484,8 +486,8 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(self->parent.tracefiles,
-                                          LttvTracefileContext, i));
+          LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
     type = lttv_attribute_get(tracefiles_tree, i, &name, &value);
     g_assert(type == LTTV_GOBJECT);
     tracefile_tree = *((LttvAttribute **)(value.v_gobject));
@@ -502,7 +504,15 @@ static void state_restore(LttvTraceState *self, LttvAttribute *container)
     g_assert(*(value.v_pointer) != NULL);
     ep = *(value.v_pointer);
     g_assert(tfcs->parent.t_context != NULL);
-    lttv_process_tracefile_seek_position(LTTV_TRACEFILE_CONTEXT(tfcs), ep);
+    
+    g_tree_destroy(tsc->pqueue);
+    tsc->pqueue = g_tree_new(compare_tracefile);
+    
+    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);
   }
 }
 
@@ -539,8 +549,8 @@ static void state_saved_free(LttvTraceState *self, LttvAttribute *container)
 
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfcs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(self->parent.tracefiles,
-                                          LttvTracefileContext, i));
+          LTTV_TRACEFILE_STATE(g_array_index(self->parent.tracefiles,
+                                          LttvTracefileContext*, i));
     type = lttv_attribute_get(tracefiles_tree, i, &name, &value);
     g_assert(type == LTTV_GOBJECT);
     tracefile_tree = *((LttvAttribute **)(value.v_gobject));
@@ -857,7 +867,7 @@ lttv_state_create_process(LttvTracefileState *tfs, LttvProcessState *parent,
   process->pid = pid;
   process->last_cpu = tfs->cpu_name;
   process->last_cpu_index = ((LttvTracefileContext*)tfs)->index;
-  g_warning("Process %u, core %p", process->pid, process);
+  g_info("Process %u, core %p", process->pid, process);
   g_hash_table_insert(tcs->processes, process, process);
 
   if(parent) {
@@ -1320,8 +1330,8 @@ void lttv_state_remove_event_hooks(LttvTracesetState *self)
 
     for(j = 0 ; j < nb_tracefile ; j++) {
       tfs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(ts->parent.tracefiles,
-                                          LttvTracefileContext, j));
+          LTTV_TRACEFILE_STATE(g_array_index(ts->parent.tracefiles,
+                                          LttvTracefileContext*, j));
 
       for(k = 0 ; k < hooks->len ; k++) {
         hook = &g_array_index(hooks, LttvTraceHook, k);
@@ -1523,8 +1533,8 @@ void lttv_state_save_add_event_hooks(LttvTracesetState *self)
 
     for(j = 0 ; j < nb_tracefile ; j++) {
       tfs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(ts->parent.tracefiles,
-                                          LttvTracefileContext, j));
+          LTTV_TRACEFILE_STATE(g_array_index(ts->parent.tracefiles,
+                                          LttvTracefileContext*, j));
       lttv_hooks_add(tfs->parent.event,
                      state_save_event_hook,
                      event_count,
@@ -1603,8 +1613,8 @@ void lttv_state_save_remove_event_hooks(LttvTracesetState *self)
 
     for(j = 0 ; j < nb_tracefile ; j++) {
       tfs = 
-          LTTV_TRACEFILE_STATE(&g_array_index(ts->parent.tracefiles,
-                                          LttvTracefileContext, j));
+          LTTV_TRACEFILE_STATE(g_array_index(ts->parent.tracefiles,
+                                          LttvTracefileContext*, j));
       event_count = lttv_hooks_remove(tfs->parent.event,
                         state_save_event_hook);
       g_free(event_count);