X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=c6a9be968f15cf08e3611ef0f2b740eb39ca677d;hb=4249a3e82a8f7ed5ac0bc8909d60b7281130c9fc;hp=635eea0b26bf6fbfabed329c6c6a6ca6f6f453e0;hpb=49024c2c94b76465ae3bbc8541cb301272b3fa72;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 635eea0b..c6a9be96 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -125,6 +125,8 @@ typedef struct _EventViewerData {
   LttvTracesetContextPosition *first_event;  /* Time of the first event shown */
   LttvTracesetContextPosition *last_event;  /* Time of the first event shown */
 
+  LttvFilter *main_win_filter;
+
 } EventViewerData ;
 
 /** hook functions for update time interval, current time ... */
@@ -132,6 +134,7 @@ gboolean update_current_time(void * hook_data, void * call_data);
 gboolean update_current_position(void * hook_data, void * call_data);
 //gboolean show_event_detail(void * hook_data, void * call_data);
 gboolean traceset_changed(void * hook_data, void * call_data);
+gboolean filter_changed(void * hook_data, void * call_data);
 
 //! Event Viewer's constructor hook
 GtkWidget *h_gui_events(Tab *tab);
@@ -232,6 +235,8 @@ gui_events(Tab *tab)
                 update_current_position,event_viewer_data);
   lttvwindow_register_traceset_notify(tab, 
                 traceset_changed,event_viewer_data);
+  lttvwindow_register_filter_notify(tab,
+                filter_changed, event_viewer_data);
 
   event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_show (event_viewer_data->scroll_win);
@@ -246,6 +251,8 @@ gui_events(Tab *tab)
   event_viewer_data->last_event =
     lttv_traceset_context_position_new(tsc);
 
+  event_viewer_data->main_win_filter = NULL;
+
   /* Create a model for storing the data list */
   event_viewer_data->store_m = gtk_list_store_new (
     N_COLUMNS,      /* Total number of columns     */
@@ -715,7 +722,7 @@ static void tree_selection_changed_cb (GtkTreeSelection *selection,
 {
   g_debug("tree sel changed cb");
   EventViewerData *event_viewer_data = (EventViewerData*) data;
-
+#if 0
     /* Set the cursor to currently selected event */
   GtkTreeModel* model = GTK_TREE_MODEL(event_viewer_data->store_m);
   GtkTreeIter iter;
@@ -743,6 +750,7 @@ static void tree_selection_changed_cb (GtkTreeSelection *selection,
     }
    gtk_tree_path_free(tree_path);
   }
+#endif //0
 }
 
 
@@ -962,6 +970,8 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
       /* There is nothing in the list : simply seek to the time value. */
       lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
           time);
+      lttv_process_traceset_middle(tsc, time, G_MAXUINT,
+                                   NULL);
     }
     
   /* Note that, as we mess with the tsc position, this function CANNOT be called
@@ -975,19 +985,49 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
     if(relative_position > 0) {
       guint count;
       count = lttv_process_traceset_seek_n_forward(tsc, relative_position,
-          lttvwindow_get_filter(event_viewer_data->tab));
+          event_viewer_data->main_win_filter);
     } else if(relative_position < 0) {
       guint count;
+      
+      /* Get an idea of currently shown event dispersion */
+      LttTime first_event_time =
+        lttv_traceset_context_position_get_time(event_viewer_data->first_event);
+      LttTime last_event_time =
+        lttv_traceset_context_position_get_time(event_viewer_data->last_event);
+      LttTime time_diff = ltt_time_sub(last_event_time, first_event_time);
+      if(ltt_time_compare(time_diff, ltt_time_zero) == 0)
+        time_diff = seek_back_default_offset;
       count = lttv_process_traceset_seek_n_backward(tsc, abs(relative_position),
-          seek_back_default_offset, lttv_process_traceset_seek_time,
-          lttvwindow_get_filter(event_viewer_data->tab));
+          time_diff,
+          (seek_time_fct)lttv_state_traceset_seek_time_closest,
+          event_viewer_data->main_win_filter);
     } /* else 0 : do nothing : we are already at the beginning position */
 
     lttv_traceset_context_position_destroy(pos);
+
+    /* Save the first event position */
+    lttv_traceset_context_position_save(tsc, event_viewer_data->first_event);
+    
+    time = lttv_traceset_context_position_get_time(
+                                            event_viewer_data->first_event);
+    LttTime time_val = ltt_time_sub(time,
+                        tsc->time_span.start_time);
+    event_viewer_data->previous_value = ltt_time_to_double(time_val);
+    
+    lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc, time);
+    lttv_process_traceset_middle(tsc, ltt_time_infinite, G_MAXUINT,
+                                 event_viewer_data->first_event);
+
   } else {
     /* Seek by time */
     lttv_state_traceset_seek_time_closest((LttvTracesetState*)tsc,
           time);
+    lttv_process_traceset_middle(tsc, time, G_MAXUINT,
+                                 NULL);
+    LttTime time_val = ltt_time_sub(time,
+                        tsc->time_span.start_time);
+    event_viewer_data->previous_value = ltt_time_to_double(time_val);
+    lttv_traceset_context_position_save(tsc, event_viewer_data->first_event);
   }
  
   /* Clear the model (don't forget to free the TCS positions!) */
@@ -1000,13 +1040,6 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
   }
   g_ptr_array_set_size(event_viewer_data->pos, 0);
   
-  /* Save the first event position */
-  lttv_traceset_context_position_save(tsc, event_viewer_data->first_event);
-  
-  time = ltt_time_sub(
-      lttv_traceset_context_position_get_time(event_viewer_data->first_event),
-                      tsc->time_span.start_time);
-  event_viewer_data->previous_value = ltt_time_to_double(time);
 
   /* Mathieu :
    * I make the choice not to use the mainwindow lttvwindow API here : it will
@@ -1015,7 +1048,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
    * seek time closest for nothing, as we only have few events to read. 
    */
   /* FIXME : use seek time closest and middle to have a good state. */
-
+  
   lttv_process_traceset_begin(tsc,
       NULL, NULL, NULL, event_viewer_data->event_hooks, NULL);
   
@@ -1024,7 +1057,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
   lttv_process_traceset_end(tsc,
       NULL, NULL, NULL, event_viewer_data->event_hooks, NULL);
   
-  /* Get the end position time */
+  /* Get the end position */
   if(event_viewer_data->pos->len > 0) {
     LttvTracesetContextPosition *cur_pos = 
       (LttvTracesetContextPosition*)g_ptr_array_index(event_viewer_data->pos,
@@ -1037,8 +1070,8 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
   gtk_adjustment_set_value(event_viewer_data->vadjust_c,
       event_viewer_data->previous_value);
   
-  g_signal_emit_by_name(G_OBJECT (event_viewer_data->select_c),
-      "changed");
+  //g_signal_emit_by_name(G_OBJECT (event_viewer_data->select_c),
+  //    "changed");
   
 
   return;
@@ -1052,7 +1085,7 @@ int event_hook(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext*)call_data;
   LttEvent *e = ltt_tracefile_get_event(tfc->tf);
 
-  LttvFilter *filter = lttvwindow_get_filter(event_viewer_data->tab);
+  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))
@@ -1193,12 +1226,41 @@ gboolean traceset_changed(void * hook_data, void * call_data)
 
   end = ltt_time_sub(time_span.end_time, time_span.start_time);
   event_viewer_data->vadjust_c->upper = ltt_time_to_double(end);
-  g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed");
+
+  /* Reset the positions */
+  lttv_traceset_context_position_destroy(
+      event_viewer_data->currently_selected_position);
+  lttv_traceset_context_position_destroy(
+      event_viewer_data->first_event);
+  lttv_traceset_context_position_destroy(
+      event_viewer_data->last_event);
+ 
+  event_viewer_data->currently_selected_position =
+    lttv_traceset_context_position_new(tsc);
+  event_viewer_data->first_event =
+    lttv_traceset_context_position_new(tsc);
+  event_viewer_data->last_event =
+    lttv_traceset_context_position_new(tsc);
+
+  get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
   //  event_viewer_data->vadjust_c->value = 0;
 
   return FALSE;
 }
 
+gboolean filter_changed(void * hook_data, void * call_data)
+{
+  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+
+  event_viewer_data->main_win_filter = 
+    (LttvFilter*)call_data;
+  get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
+
+  return FALSE;
+}
+
 
 
 
@@ -1234,6 +1296,8 @@ void gui_events_free(EventViewerData *event_viewer_data)
     //                    show_event_detail, event_viewer_data);
     lttvwindow_unregister_traceset_notify(tab,
                         traceset_changed, event_viewer_data);
+    lttvwindow_unregister_filter_notify(tab,
+                        filter_changed, event_viewer_data);
 
     g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list,
         event_viewer_data);