X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=074a07aa110181abf8099d5df4ed921c2399b19d;hb=aaecaa999a51da6f31979c3a98825545ce8e35c8;hp=6610522866dcbf5ae3433ce408fd2236d4e964ea;hpb=6f43371e2ea6301dc6ca45c313749058a618e925;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 66105228..074a07aa 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -127,6 +127,8 @@ typedef struct _EventViewerData {
   LttvTracesetContextPosition *currently_selected_position;
   gboolean update_cursor; /* Speed optimisation : do not update cursor when 
                              unnecessary */
+  gboolean report_position; /* do not report position when in current_time
+                               update */
 
   LttvTracesetContextPosition *first_event;  /* Time of the first event shown */
   LttvTracesetContextPosition *last_event;  /* Time of the first event shown */
@@ -265,9 +267,10 @@ gui_events(Tab *tab)
   event_viewer_data->last_event =
     lttv_traceset_context_position_new(tsc);
 
-  event_viewer_data->main_win_filter = NULL;
+  event_viewer_data->main_win_filter = lttvwindow_get_filter(tab);
 
   event_viewer_data->update_cursor = TRUE;
+  event_viewer_data->report_position = TRUE;
 
   /* Create a model for storing the data list */
   event_viewer_data->store_m = gtk_list_store_new (
@@ -924,16 +927,21 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
 
   /* On cursor change, modify the currently selected event by calling
    * the right API function */
-  tree_v_get_cursor(event_viewer_data);
   
-  gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-      &path, NULL);
-  if(gtk_tree_model_get_iter(model,&iter,path)){
-    gtk_tree_model_get(model, &iter, POSITION_COLUMN, &pos, -1);
- 
-    lttvwindow_report_current_position(tab, pos);
-  }else{
-    g_warning("Can not get iter\n");
+  
+  if(event_viewer_data->report_position) {
+    gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+        &path, NULL);
+    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);
   }
 }
 
@@ -1180,13 +1188,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,
@@ -1231,6 +1253,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);
@@ -1374,6 +1399,7 @@ static void event_update_selection(EventViewerData *event_viewer_data)
 {
   guint i;
   GPtrArray *positions = event_viewer_data->pos;
+  g_info("event_update_selection");
 
   for(i=0;i<positions->len;i++) {
     LttvTracesetContextPosition *cur_pos = 
@@ -1391,6 +1417,7 @@ static void event_update_selection(EventViewerData *event_viewer_data)
 
 gboolean update_current_time(void * hook_data, void * call_data)
 {
+  g_info("update_current_time");
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttTime * current_time = (LttTime*)call_data;
   LttvTracesetContext * tsc =
@@ -1403,7 +1430,22 @@ gboolean update_current_time(void * hook_data, void * call_data)
       event_viewer_data->currently_selected_position);
   if(ltt_time_compare(pos_time, *current_time) != 0) {
     
+    lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
+        *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 */
+    // We don't care : this will be taken care of by the _middle.
+    //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
+
     lttv_traceset_context_position_save(tsc,
         event_viewer_data->currently_selected_position);
     pos_time = lttv_traceset_context_position_get_time(
@@ -1413,6 +1455,7 @@ gboolean update_current_time(void * hook_data, void * call_data)
   LttTime time = ltt_time_sub(pos_time, tsc->time_span.start_time);
   double new_value = ltt_time_to_double(time);
  
+  event_viewer_data->report_position = FALSE;
   /* Change the viewed area if does not match */
   if(lttv_traceset_context_pos_pos_compare(
         event_viewer_data->currently_selected_position,
@@ -1423,15 +1466,17 @@ gboolean update_current_time(void * hook_data, void * call_data)
         event_viewer_data->last_event) > 0) {
     gtk_adjustment_set_value(event_viewer_data->vadjust_c, new_value);
   } else {
-      /* Simply update the current time : it is in the list */
-      event_update_selection(event_viewer_data);
+    /* Simply update the current time : it is in the list */
+    event_update_selection(event_viewer_data);
   }
+  event_viewer_data->report_position = TRUE;
   
   return FALSE;
 }
 
 gboolean update_current_position(void * hook_data, void * call_data)
 {
+  g_info("update_current_position");
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttvTracesetContextPosition *current_pos =
     (LttvTracesetContextPosition*)call_data;
@@ -1443,7 +1488,6 @@ gboolean update_current_position(void * hook_data, void * call_data)
     lttv_traceset_context_position_copy(
         event_viewer_data->currently_selected_position, current_pos);
 
-  
     /* Change the viewed area if does not match */
     if(lttv_traceset_context_pos_pos_compare(
           event_viewer_data->currently_selected_position,