seek backward beginning of trace fix

[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 cb7d41857097f76030ae4b85b72d64396d8145f7..73096b3d0e4dceeeb145abb949f038f41e470749 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");
@@ -1248,7 +1248,7 @@ gint lttv_traceset_context_pos_pos_compare(
                                   const LttvTracesetContextPosition *pos2)
 {
   int i, j;
-  int ret;
+  int ret = 0;
   
   if(pos1->tfcp->len == 0) {
     if(pos2->tfcp->len == 0) return 0;
@@ -1345,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,
@@ -1409,6 +1409,7 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self,
   LttvTracesetContextPosition *saved_pos =
     lttv_traceset_context_position_new(self);
   LttTime time;
+  LttTime asked_time;
   LttTime time_offset;
   struct seek_back_data sd;
   LttvHooks *hooks = lttv_hooks_new();
@@ -1431,6 +1432,7 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self,
   if(ltt_time_compare(time, self->time_span.end_time) > 0) {
     time = self->time_span.end_time;
   }
+  asked_time = time;
   time_offset = first_offset;
  
   lttv_hooks_add(hooks, seek_back_event_hook, &sd, LTTV_PRIO_DEFAULT);
@@ -1439,14 +1441,15 @@ guint lttv_process_traceset_seek_n_backward(LttvTracesetContext *self,
 
   while(1) {
     /* stop criteria : - n events found
-     *                 - time < beginning of trace */
-    if(ltt_time_compare(time, self->time_span.start_time) < 0) break;
+     *                 - asked_time < beginning of trace */
+    if(ltt_time_compare(asked_time, self->time_span.start_time) < 0) break;
 
     lttv_traceset_context_position_copy(end_pos, next_iter_end_pos);
 
     /* We must seek the traceset back to time - time_offset */
     /* this time becomes the new reference time */
     time = ltt_time_sub(time, time_offset);
+    asked_time = time;
     
     time_seeker(self, time);
     lttv_traceset_context_position_save(self, next_iter_end_pos);