put back in a coherent state after a current time change
[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c
index 690588f1d9d3794b6a9077d801c4f77a898c14b0..cff98ee101b286a552eb9c2ff9fcda294baa8c27 100644 (file)
@@ -127,10 +127,14 @@ 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 */
 
+  LttvTracesetContextPosition *current_time_get_first; 
+
   LttvFilter *main_win_filter;
 
   gint background_info_waiting;
@@ -265,9 +269,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 (
@@ -546,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,
@@ -687,7 +691,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
         LttvTracesetContextPosition *end_pos = 
           (LttvTracesetContextPosition*)g_ptr_array_index(
                                              event_viewer_data->pos,
-                                             event_viewer_data->pos->len - 1);
+                                             event_viewer_data->pos->len-1);
         if(lttv_traceset_context_pos_pos_compare(end_pos, 
               event_viewer_data->currently_selected_position) == 0) {
           /* Must get down one event and select the last one */
@@ -703,12 +707,6 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
                                    path, NULL, FALSE);
           gtk_tree_path_free(path);
         }
-#if 0       
-          GtkTreePath *path = gtk_tree_path_new_from_indices(i, -1);
-          gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
-                                 path, NULL, FALSE);
-          gtk_tree_path_free(path);
-#endif //0
       }
 
     } else {
@@ -743,7 +741,7 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
         LttvTracesetContextPosition *end_pos = 
           (LttvTracesetContextPosition*)g_ptr_array_index(
                                              event_viewer_data->pos,
-                                             event_viewer_data->pos->len - 1);
+                                             event_viewer_data->pos->len-1);
         if(lttv_traceset_context_pos_pos_compare(end_pos, 
               event_viewer_data->currently_selected_position) == 0) {
           /* Must get down one page and select the last one */
@@ -930,16 +928,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);
   }
 }
 
@@ -1186,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,
@@ -1237,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);
@@ -1368,7 +1388,7 @@ int event_hook(void *hook_data, void *call_data)
     }
   }
   
-  if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events -1 )
+  if(event_viewer_data->pos->len >= event_viewer_data->num_visible_events )
     return TRUE;
   else
     return FALSE;
@@ -1380,6 +1400,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 = 
@@ -1394,9 +1415,27 @@ 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)
 {
+  g_info("update_current_time");
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttTime * current_time = (LttTime*)call_data;
   LttvTracesetContext * tsc =
@@ -1409,9 +1448,35 @@ 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_process_traceset_seek_time(tsc, *current_time);
-    lttv_traceset_context_position_save(tsc,
-        event_viewer_data->currently_selected_position);
+    lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
+        *current_time);
+    lttv_process_traceset_middle(tsc, *current_time, G_MAXUINT,
+                                   NULL);
+
+    /* 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_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);
   }
@@ -1419,6 +1484,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,
@@ -1429,15 +1495,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;
@@ -1449,7 +1517,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,
This page took 0.025814 seconds and 4 git commands to generate.