fix end of tracefile bug in process traceset middle

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

diff --git a/ltt/branches/poly/lttv/lttv/tracecontext.c b/ltt/branches/poly/lttv/lttv/tracecontext.c
index 7d560557654a2a239ff5fbbbad4a643d93c3f990..1aaccb5fc2b7423c5ae397720830a78dd334199d 100644 (file)
--- a/ltt/branches/poly/lttv/lttv/tracecontext.c
+++ b/ltt/branches/poly/lttv/lttv/tracecontext.c
@@ -681,7 +681,7 @@ void lttv_process_traceset_begin(LttvTracesetContext *self,
   
 }
 
-enum read_state { LAST_NONE, LAST_OK, LAST_EMPTY };
+//enum read_state { LAST_NONE, LAST_OK, LAST_EMPTY };
 
 /* Note : a _middle must be preceded from a _seek or another middle */
 guint lttv_process_traceset_middle(LttvTracesetContext *self,
@@ -701,7 +701,7 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self,
 
   guint read_ret;
 
-  enum read_state last_read_state = LAST_NONE;
+  //enum read_state last_read_state = LAST_NONE;
 
   gboolean last_ret = FALSE; /* return value of the last hook list called */
 
@@ -755,19 +755,19 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self,
     g_tree_foreach(pqueue, test_tree, tfc);
 #endif //DEBUG
 
+
     e = ltt_tracefile_get_event(tfc->tf);
 
-    if(last_read_state != LAST_EMPTY) {
-      /* Only call hooks if the last read has given an event or if we are at the
-       * first pass (not if last read returned end of tracefile) */
-      count++;
-      
-      fac_id = ltt_event_facility_id(e);
-      ev_id = ltt_event_eventtype_id(e);
-      id = GET_HOOK_ID(fac_id, ev_id);
-      last_ret = lttv_hooks_call_merge(tfc->event, tfc,
-                          lttv_hooks_by_id_get(tfc->event_by_id, id), tfc);
-    }
+    //if(last_read_state != LAST_EMPTY) {
+    /* Only call hooks if the last read has given an event or if we are at the
+     * first pass (not if last read returned end of tracefile) */
+    count++;
+    
+    fac_id = ltt_event_facility_id(e);
+    ev_id = ltt_event_eventtype_id(e);
+    id = GET_HOOK_ID(fac_id, ev_id);
+    last_ret = lttv_hooks_call_merge(tfc->event, tfc,
+                        lttv_hooks_by_id_get(tfc->event_by_id, id), tfc);
     
     read_ret = ltt_tracefile_read(tfc->tf);
 
@@ -783,12 +783,12 @@ guint lttv_process_traceset_middle(LttvTracesetContext *self,
       g_tree_foreach(pqueue, test_tree, NULL);
 #endif //DEBUG
 
-      last_read_state = LAST_OK;
+      //last_read_state = LAST_OK;
     } else {
       tfc->timestamp = ltt_time_infinite;
 
       if(read_ret == ERANGE) {
-        last_read_state = LAST_EMPTY;
+      //  last_read_state = LAST_EMPTY;
         g_debug("End of trace");
       } else
         g_error("Error happened in lttv_process_traceset_middle");
@@ -835,7 +835,7 @@ void lttv_process_trace_seek_time(LttvTraceContext *self, LttTime start)
   for(i = 0 ; i < nb_tracefile ; i++) {
     tfc = &g_array_index(self->tracefiles, LttvTracefileContext*, i);
 
-    //g_tree_remove(pqueue, *tfc);
+    g_tree_remove(pqueue, *tfc);
     
     ret = ltt_tracefile_seek_time((*tfc)->tf, start);
     if(ret == EPERM) g_error("error in lttv_process_trace_seek_time seek");
@@ -866,8 +866,8 @@ void lttv_process_traceset_seek_time(LttvTracesetContext *self, LttTime start)
 
   LttvTraceContext *tc;
 
-  g_tree_destroy(self->pqueue);
-  self->pqueue = g_tree_new(compare_tracefile);
+  //g_tree_destroy(self->pqueue);
+  //self->pqueue = g_tree_new(compare_tracefile);
 
   nb_trace = lttv_traceset_number(self->ts);
   for(i = 0 ; i < nb_trace ; i++) {
@@ -881,16 +881,33 @@ gboolean lttv_process_traceset_seek_position(LttvTracesetContext *self,
                                         const LttvTracesetContextPosition *pos)
 {
   guint i;
-  
-  /* If a position is set, seek the traceset to this position */
+   /* If a position is set, seek the traceset to this position */
   if(ltt_time_compare(pos->timestamp, ltt_time_infinite) != 0) {
-    g_tree_destroy(self->pqueue);
-    self->pqueue = g_tree_new(compare_tracefile);
+
+    /* Test to see if the traces has been added to the trace set :
+     * It should NEVER happen. Clear all positions if a new trace comes in. */
+    /* FIXME I know this test is not optimal : should keep a number of
+     * tracefiles variable in the traceset.. eventually */
+    guint num_traces = lttv_traceset_number(self->ts);
+    guint tf_count = 0;
+    for(i=0; i<num_traces;i++) {
+      GArray * tracefiles = self->traces[i]->tracefiles;
+      guint j;
+      guint num_tracefiles = tracefiles->len;
+      for(j=0;j<num_tracefiles;j++)
+        tf_count++;
+    }
+    g_assert(tf_count == pos->tfcp->len);
+     
+
+    //g_tree_destroy(self->pqueue);
+    //self->pqueue = g_tree_new(compare_tracefile);
     
     for(i=0;i<pos->tfcp->len; i++) {
       LttvTracefileContextPosition *tfcp = 
         &g_array_index(pos->tfcp, LttvTracefileContextPosition, i);
-      
+
+      g_tree_remove(self->pqueue, tfcp->tfc);
       
       if(tfcp->used == TRUE) {
         if(ltt_tracefile_seek_position(tfcp->tfc->tf, tfcp->event) != 0)
@@ -1328,7 +1345,7 @@ static gint seek_back_event_hook(void *hook_data, void* call_data)
   LttvTracesetContext *tsc = tfc->t_context->ts_context;
   LttvTracesetContextPosition *pos;
 
-  if(sd->filter != NULL) {
+  if(sd->filter != NULL && sd->filter->head != NULL) {
     if(!lttv_filter_tree_parse(sd->filter->head,
           ltt_tracefile_get_event(tfc->tf),
           tfc->tf,