put back in a coherent state after a current time change

[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 0b89478670f5e06fcc61c25150d8a2b805fa31b3..cff98ee101b286a552eb9c2ff9fcda294baa8c27 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -133,6 +133,8 @@ typedef struct _EventViewerData {
   LttvTracesetContextPosition *first_event;  /* Time of the first event shown */
   LttvTracesetContextPosition *last_event;  /* Time of the first event shown */
 
+  LttvTracesetContextPosition *current_time_get_first; 
+
   LttvFilter *main_win_filter;
 
   gint background_info_waiting;
@@ -549,9 +551,8 @@ static void request_background_data(EventViewerData *event_viewer_data)
          * information. Happens when two viewers ask for it before servicing
          * starts.
          */
-        lttvwindowtraces_background_request_remove(trace, "state");
-        lttvwindowtraces_background_request_queue(trace,
-                                                  "state");
+        if(!lttvwindowtraces_background_request_find(trace, "state"))
+          lttvwindowtraces_background_request_queue(trace, "state");
         lttvwindowtraces_background_notify_queue(event_viewer_data,
                                                  trace,
                                                  ltt_time_infinite,
@@ -935,10 +936,13 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
     if(gtk_tree_model_get_iter(model,&iter,path)){
       gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1);
       
+      if(lttv_traceset_context_pos_pos_compare(pos, 
+            event_viewer_data->currently_selected_position) != 0)
         lttvwindow_report_current_position(tab, pos);
     }else{
       g_warning("Can not get iter\n");
     }
+    gtk_tree_path_free(path);
   }
 }
 
@@ -1185,13 +1189,27 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
     LttvTracesetContextPosition *pos =
         lttv_traceset_context_position_new(tsc);
     
-  /* Remember the beginning position */
+    /* Remember the beginning position */
     if(event_viewer_data->pos->len > 0) {
       LttvTracesetContextPosition *first_pos = 
-        (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos,
-                                                        0);
+        (LttvTracesetContextPosition*)g_ptr_array_index(
+                                                    event_viewer_data->pos,
+                                                    0);
       lttv_traceset_context_position_copy(pos, first_pos);
-      g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); 
+
+      if(relative_position >= 0) {
+        LttTime first_event_time = 
+            lttv_traceset_context_position_get_time(
+                              pos);
+        lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
+          first_event_time);
+        lttv_process_traceset_middle(tsc, ltt_time_infinite,
+                                   G_MAXUINT,
+                                   pos);
+       
+      } else if(relative_position < 0) {
+        g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); 
+      }
     } else {
       /* There is nothing in the list : simply seek to the time value. */
       lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
@@ -1236,6 +1254,9 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
     
     time = lttv_traceset_context_position_get_time(
                                             event_viewer_data->first_event);
+    //if(ltt_time_compare(time, tsc->time_span.end_time) > 0)
+    //  time = tsc->time_span.end_time;
+
     LttTime time_val = ltt_time_sub(time,
                         tsc->time_span.start_time);
     event_viewer_data->previous_value = ltt_time_to_double(time_val);
@@ -1394,6 +1415,23 @@ static void event_update_selection(EventViewerData *event_viewer_data)
   }
 }
 
+static int current_time_get_first_event_hook(void *hook_data, void *call_data)
+{
+  EventViewerData *event_viewer_data = (EventViewerData*)hook_data;
+  LttvTracefileContext *tfc = (LttvTracefileContext*)call_data;
+  LttEvent *e = ltt_tracefile_get_event(tfc->tf);
+
+  LttvFilter *filter = event_viewer_data->main_win_filter;
+  if(filter != NULL && filter->head != NULL)
+    if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+          tfc->t_context->t,tfc))
+      return FALSE;
+
+  lttv_traceset_context_position_save(tfc->t_context->ts_context, 
+      event_viewer_data->current_time_get_first);
+  return TRUE;
+}
+
 
 gboolean update_current_time(void * hook_data, void * call_data)
 {
@@ -1414,19 +1452,31 @@ gboolean update_current_time(void * hook_data, void * call_data)
         *current_time);
     lttv_process_traceset_middle(tsc, *current_time, G_MAXUINT,
                                    NULL);
-    /* Little trick : seek 0 events forward to get the first event
-     * that passes the filter. The trick is to have a match function that
-     * returns 2 : it makes the read stop and keep the last position */
-    guint count;
-    count = lttv_process_traceset_seek_n_forward(tsc, 0,
-          event_viewer_data->main_win_filter);
 
-#if 0
-    lttv_process_traceset_seek_time(tsc, *current_time);
-#endif //0
+    /* Get the first event that passes in the filter */
+    event_viewer_data->current_time_get_first =
+                lttv_traceset_context_position_new(tsc);
+    LttvHooks *hooks = lttv_hooks_new();
+    lttv_hooks_add(hooks,
+                   current_time_get_first_event_hook,
+                   event_viewer_data,
+                   LTTV_PRIO_DEFAULT);
+
+    lttv_process_traceset_begin(tsc,
+        NULL, NULL, NULL, hooks, NULL);
+    
+    lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT, NULL);
+    
+    lttv_process_traceset_end(tsc,
+        NULL, NULL, NULL, hooks, NULL);
+   
+    lttv_hooks_destroy(hooks);
 
-    lttv_traceset_context_position_save(tsc,
-        event_viewer_data->currently_selected_position);
+    lttv_traceset_context_position_copy(
+        event_viewer_data->currently_selected_position,
+        event_viewer_data->current_time_get_first);
+    lttv_traceset_context_position_destroy(
+        event_viewer_data->current_time_get_first);
     pos_time = lttv_traceset_context_position_get_time(
         event_viewer_data->currently_selected_position);
   }