X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=5f4fc90dd295379ae1ad40eb02bbec9cfd28c439;hb=3d4e2d0871713faee1a132e54e0e3e0276e78d6a;hp=217e1abb4a6efc266628d62dc15dedc593b46ae8;hpb=04f2543ebde7de5ec5102e37dbcb4d280c3a87ed;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 217e1abb..5f4fc90d 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -66,7 +66,10 @@
 #include <lttvwindow/lttvwindow.h>
 #include <lttvwindow/lttvwindowtraces.h>
 #include <lttvwindow/lttv_plugin_tab.h>
+#include <lttvwindow/support.h>
+#include "lttv_plugin_evd.h"
 
+#include "events.h"
 #include "hGuiEventsInsert.xpm"
 
 #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
@@ -91,66 +94,6 @@ typedef enum _ScrollDirection{
   SCROLL_NONE
 } ScrollDirection;
 
-typedef struct _EventViewerData {
-
-  Tab * tab;
-  LttvPluginTab *ptab;
-  LttvHooks  * event_hooks;
-
-  /* previous value is used to determine if it is a page up/down or
-   * step up/down, in which case we move of a certain amount of events (one or
-   * the number of events shown on the screen) instead of changing begin time.
-   */
-  double       previous_value;
-
-  //scroll window containing Tree View
-  GtkWidget * scroll_win;
-
-  /* Model containing list data */
-  GtkListStore *store_m;
-
-  GPtrArray *pos; /* Array of LttvTracesetContextPosition * */
- 
-  GtkWidget *top_widget;
-  GtkWidget *hbox_v;
-  /* Widget to display the data in a columned list */
-  GtkWidget *tree_v;
-  GtkAdjustment *vtree_adjust_c ;
-  GtkWidget *button; /* a button of the header, used to get the header_height */
-  gint header_height;
-  
-  /* Vertical scrollbar and its adjustment */
-  GtkWidget *vscroll_vc;
-  GtkAdjustment *vadjust_c;
-  
-  /* Selection handler */
-  GtkTreeSelection *select_c;
-  
-  gint num_visible_events;
-  
-  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;
-
-  guint32 last_tree_update_time; /* To filter out repeat keys */
-
-  guint num_events;  /* Number of events processed */
-
-  gboolean in_get_events;
-
-} EventViewerData ;
-
 /** hook functions for update time interval, current time ... */
 gboolean update_current_time(void * hook_data, void * call_data);
 gboolean update_current_position(void * hook_data, void * call_data);
@@ -165,8 +108,8 @@ GtkWidget *h_gui_events(LttvPlugin *plugin);
 //! Event Viewer's constructor
 EventViewerData *gui_events(LttvPluginTab *ptab);
 //! Event Viewer's destructor
-void gui_events_destructor(EventViewerData *event_viewer_data);
-void gui_events_free(EventViewerData *event_viewer_data);
+void gui_events_destructor(gpointer data);
+void gui_events_free(gpointer data);
 
 static gboolean
 header_size_allocate(GtkWidget *widget,
@@ -187,12 +130,12 @@ static void tree_v_size_request_cb (GtkWidget *widget,
 static void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data);
 static void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1,
     gint arg2, gpointer data);
+static void        filter_button      (GtkToolButton *toolbutton,
+                                          gpointer       user_data);
 static gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data);
 static gboolean key_handler(GtkWidget *widget, GdkEventKey *event,
     gpointer user_data);
 
-static gint redraw_notify(void *hook_data, void *call_data);
-
 static void get_events(double time, EventViewerData *event_viewer_data);
 
 int event_hook(void *hook_data, void *call_data);
@@ -244,10 +187,13 @@ gui_events(LttvPluginTab *ptab)
   LttTime end;
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
-  EventViewerData* event_viewer_data = g_new(EventViewerData,1) ;
+  EventViewerData* event_viewer_data = g_new(EventViewerData,1);
+  LttvPluginEVD *plugin_evd = g_object_new(LTTV_TYPE_PLUGIN_EVD, NULL);
+  plugin_evd->evd = event_viewer_data;
   Tab *tab = ptab->tab;
   event_viewer_data->tab = tab;
   event_viewer_data->ptab = ptab;
+  GtkWidget *tmp_toolbar_icon;
 
   LttvTracesetContext * tsc =
         lttvwindow_get_traceset_context(event_viewer_data->tab);
@@ -268,7 +214,7 @@ gui_events(LttvPluginTab *ptab)
   lttvwindow_register_filter_notify(tab,
                 filter_changed, event_viewer_data);
   lttvwindow_register_redraw_notify(tab,
-                redraw_notify, event_viewer_data);
+                evd_redraw_notify, event_viewer_data);
   
 
   event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL);
@@ -291,6 +237,8 @@ gui_events(LttvPluginTab *ptab)
 
   event_viewer_data->last_tree_update_time = 0;
 
+  event_viewer_data->init_done = 0;
+
   /* Create a model for storing the data list */
   event_viewer_data->store_m = gtk_list_store_new (
     N_COLUMNS,      /* Total number of columns     */
@@ -334,6 +282,8 @@ gui_events(LttvPluginTab *ptab)
       G_CALLBACK(tree_v_scroll_handler),
       event_viewer_data);
 
+
+
   // Use on each column!
   //gtk_tree_view_column_set_sizing(event_viewer_data->tree_v,
   //GTK_TREE_VIEW_COLUMN_FIXED);
@@ -461,6 +411,30 @@ gui_events(LttvPluginTab *ptab)
 
   event_viewer_data->hbox_v = gtk_hbox_new(0, 0);
   event_viewer_data->top_widget = event_viewer_data->hbox_v;
+  plugin_evd->parent.top_widget = event_viewer_data->hbox_v;
+
+  event_viewer_data->toolbar = gtk_toolbar_new();
+  gtk_toolbar_set_orientation(GTK_TOOLBAR(event_viewer_data->toolbar),
+                              GTK_ORIENTATION_VERTICAL);
+
+  tmp_toolbar_icon = create_pixmap (main_window_get_widget(tab),
+      "guifilter16x16.png");
+  gtk_widget_show(tmp_toolbar_icon);
+  event_viewer_data->button_filter = gtk_tool_button_new(tmp_toolbar_icon,
+      "Filter");
+  g_signal_connect (G_OBJECT(event_viewer_data->button_filter),
+        "clicked",
+        G_CALLBACK (filter_button),
+        (gpointer)plugin_evd);
+  gtk_toolbar_insert(GTK_TOOLBAR(event_viewer_data->toolbar),
+      event_viewer_data->button_filter,
+      0);
+  gtk_toolbar_set_style(GTK_TOOLBAR(event_viewer_data->toolbar),
+      GTK_TOOLBAR_ICONS);
+  gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v),
+      event_viewer_data->toolbar, FALSE, FALSE, 0);
+  event_viewer_data->filter = NULL;
+
   gtk_box_pack_start(GTK_BOX(event_viewer_data->hbox_v),
       event_viewer_data->scroll_win, TRUE, TRUE, 0);
 
@@ -488,6 +462,9 @@ gui_events(LttvPluginTab *ptab)
   event_viewer_data->previous_value = 0;
   event_viewer_data->vadjust_c->lower = 0.0;
     //event_viewer_data->vadjust_c->upper = event_viewer_data->number_of_events;
+  LttTime time = lttvwindow_get_current_time(tab);
+  time = ltt_time_sub(time, tsc->time_span.start_time);
+  event_viewer_data->vadjust_c->value = ltt_time_to_double(time);
   event_viewer_data->vadjust_c->value = 0.0;
   event_viewer_data->vadjust_c->step_increment = 1.0;
   event_viewer_data->vadjust_c->page_increment = 2.0;
@@ -495,13 +472,15 @@ gui_events(LttvPluginTab *ptab)
   event_viewer_data->vadjust_c->page_size = 2.0;
   //    event_viewer_data->vtree_adjust_c->upper;
   /*  Raw event trace */
+  gtk_widget_show(GTK_WIDGET(event_viewer_data->button_filter));
+  gtk_widget_show(event_viewer_data->toolbar);
   gtk_widget_show(event_viewer_data->hbox_v);
   gtk_widget_show(event_viewer_data->tree_v);
   gtk_widget_show(event_viewer_data->vscroll_vc);
 
   /* Add the object's information to the module's array */
   g_event_viewer_data_list = g_slist_append(g_event_viewer_data_list,
-      event_viewer_data);
+      plugin_evd);
 
   event_viewer_data->num_visible_events = 1;
 
@@ -520,17 +499,20 @@ gui_events(LttvPluginTab *ptab)
  //
   g_object_set_data_full(
       G_OBJECT(event_viewer_data->hbox_v),
-      "event_viewer_data",
-      event_viewer_data,
+      "plugin_data",
+      plugin_evd,
       (GDestroyNotify)gui_events_free);
-  
-  event_viewer_data->in_get_events = FALSE;
 
+  g_object_set_data(
+      G_OBJECT(event_viewer_data->hbox_v),
+      "event_viewer_data",
+      event_viewer_data);
+  
   event_viewer_data->background_info_waiting = 0;
 
+
   request_background_data(event_viewer_data);
   
-
   return event_viewer_data;
 }
 
@@ -546,7 +528,7 @@ static gint background_ready(void *hook_data, void *call_data)
   if(event_viewer_data->background_info_waiting == 0) {
     g_message("event viewer : background computation data ready.");
 
-    redraw_notify(event_viewer_data, NULL);
+    evd_redraw_notify(event_viewer_data, NULL);
   }
 
   return 0;
@@ -560,6 +542,7 @@ static void request_background_data(EventViewerData *event_viewer_data)
   gint num_traces = lttv_traceset_number(tsc->ts);
   gint i;
   LttvTrace *trace;
+  LttvTraceState *tstate;
 
   LttvHooks *background_ready_hook = 
     lttv_hooks_new();
@@ -569,8 +552,10 @@ static void request_background_data(EventViewerData *event_viewer_data)
   
   for(i=0;i<num_traces;i++) {
     trace = lttv_traceset_get(tsc->ts, i);
+    tstate = LTTV_TRACE_STATE(tsc->traces[i]);
 
-    if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) {
+    if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE
+        && !tstate->has_precomputed_states) {
 
       if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"),
                                           trace) == FALSE) {
@@ -597,8 +582,8 @@ static void request_background_data(EventViewerData *event_viewer_data)
         event_viewer_data->background_info_waiting++;
       }
     } else {
-      /* Data ready. Be its nature, this viewer doesn't need to have
-       * its data ready hook called htere, because a background
+      /* Data ready. By its nature, this viewer doesn't need to have
+       * its data ready hook called there, because a background
        * request is always linked with a redraw.
        */
     }
@@ -1037,6 +1022,30 @@ void tree_v_move_cursor_cb (GtkWidget *widget,
 #endif //0
 }
 
+static void        filter_button      (GtkToolButton *toolbutton,
+                                          gpointer       user_data)
+{
+  LttvPluginEVD *plugin_evd = (LttvPluginEVD*)user_data;
+  LttvAttribute *attribute;
+  LttvAttributeValue value;
+  gboolean ret;
+  g_printf("Filter button clicked\n");
+
+  attribute = LTTV_ATTRIBUTE(lttv_iattribute_find_subdir(
+        LTTV_IATTRIBUTE(lttv_global_attributes()),
+        LTTV_VIEWER_CONSTRUCTORS));
+  g_assert(attribute);
+
+  ret = lttv_iattribute_find_by_path(LTTV_IATTRIBUTE(attribute),
+      "guifilter", LTTV_POINTER, &value);
+  g_assert(ret);
+  lttvwindow_viewer_constructor constructor =
+    (lttvwindow_viewer_constructor)*(value.v_pointer);
+  if(constructor) constructor(&plugin_evd->parent);
+  else g_warning("Filter module not loaded.");
+
+  //FIXME : viewer returned.
+}
 
 gboolean tree_v_scroll_handler (GtkWidget *widget, GdkEventScroll *event, gpointer data)
 {
@@ -1097,6 +1106,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);
@@ -1225,14 +1235,15 @@ void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer
     floor(exact_num_visible);
 */
  
-  g_debug("size allocate : last_num_visible_events : %d,\
-           num_visible_events : %d",
-           last_num_visible_events,
-           event_viewer_data->num_visible_events);
-  if(event_viewer_data->num_visible_events != last_num_visible_events)
-    {
+  g_debug("size allocate %p : last_num_visible_events : %d",
+           event_viewer_data, last_num_visible_events);
+  g_debug("num_visible_events : %d, value %lu",
+           event_viewer_data->num_visible_events,
+	   event_viewer_data->vadjust_c->value);
+
+  if(event_viewer_data->num_visible_events != last_num_visible_events) {
       get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
-    }
+  }
   
 
 }
@@ -1276,15 +1287,29 @@ gboolean show_event_detail(void * hook_data, void * call_data)
 }
 #endif //0
 
-static gboolean events_check_handler(guint count, gboolean *stop_flag)
+static gboolean events_check_handler(guint count, gboolean *stop_flag,
+  gpointer data)
 {
+  EventViewerData *evd = (EventViewerData*)data;
   if(count % CHECK_GDK_INTERVAL == 0) {
-    gtk_main_iteration_do(FALSE);
+    GdkEvent *event;
+    GtkWidget *widget;
+    while((event = gdk_event_get()) != NULL) {
+        widget = gtk_get_event_widget(event);
+        if(widget == 
+	  lookup_widget(main_window_get_widget(evd->tab),
+	      "StopProcessingButton")
+	  || widget == evd->vscroll_vc) {
+          gtk_main_do_event(event);
+	  gdk_window_process_all_updates();
+	}
+        gdk_event_free(event);
+    }
     if(*stop_flag)
       return TRUE;
     else
       return FALSE;
-  }
+  } else return FALSE;
 }
 
 static void get_events(double new_value, EventViewerData *event_viewer_data)
@@ -1296,12 +1321,11 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
   guint i;
   gboolean seek_by_time;
   
-  if(event_viewer_data->in_get_events) return;
+  if(lttvwindow_preempt_count > 0) return;
 
   double value = new_value - event_viewer_data->previous_value;
 
   /* Set stop button status for foreground processing */
-  event_viewer_data->in_get_events = TRUE;
   event_viewer_data->tab->stop_foreground = FALSE;
   lttvwindow_events_request_disable();
   
@@ -1404,8 +1428,10 @@ 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,
-          event_viewer_data->main_win_filter, events_check_handler,
-          &event_viewer_data->tab->stop_foreground);
+          events_check_handler,
+          &event_viewer_data->tab->stop_foreground,
+          event_viewer_data->main_win_filter,
+          event_viewer_data->filter, NULL, event_viewer_data);
     } else if(relative_position < 0) {
       guint count;
       
@@ -1422,9 +1448,10 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
           abs(relative_position),
           time_diff,
           (seek_time_fct)lttv_state_traceset_seek_time_closest,
-          event_viewer_data->main_win_filter,
 	  events_check_handler,
-	  &event_viewer_data->tab->stop_foreground);
+	  &event_viewer_data->tab->stop_foreground,
+          event_viewer_data->main_win_filter,
+          event_viewer_data->filter, NULL, event_viewer_data);
     } /* else 0 : do nothing : we are already at the beginning position */
 
     lttv_traceset_context_position_destroy(pos);
@@ -1506,13 +1533,11 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
         gtk_widget_get_parent_window(event_viewer_data->tree_v));
 
   lttvwindow_events_request_enable();
-  event_viewer_data->in_get_events = FALSE;
 
   return;
 }
 
 
-
 int event_hook(void *hook_data, void *call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*)hook_data;
@@ -1521,7 +1546,20 @@ int event_hook(void *hook_data, void *call_data)
   LttEvent *e = ltt_tracefile_get_event(tfc->tf);
 
   if(event_viewer_data->num_events % CHECK_GDK_INTERVAL == 0) {
-    gtk_main_iteration_do(FALSE);
+    GdkEvent *event;
+    GtkWidget *widget;
+    while((event = gdk_event_get()) != NULL) {
+        widget = gtk_get_event_widget(event);
+        if(widget == 
+	  lookup_widget(main_window_get_widget(event_viewer_data->tab),
+	      "StopProcessingButton")
+	  || widget == event_viewer_data->vscroll_vc) {
+          gtk_main_do_event(event);
+	  gdk_window_process_all_updates();
+	}
+        gdk_event_free(event);
+    }
+    //gtk_main_iteration_do(FALSE);
     if(event_viewer_data->tab->stop_foreground)
       return TRUE;
   }
@@ -1530,9 +1568,16 @@ int event_hook(void *hook_data, void *call_data)
   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))
+          tfc->t_context->t,tfc,NULL,NULL))
+      return FALSE;
+
+  filter = event_viewer_data->filter;
+  if(filter != NULL && filter->head != NULL)
+    if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+          tfc->t_context->t,tfc,NULL,NULL))
       return FALSE;
 
+
   LttFacility *facility = ltt_event_facility(e);
   LttEventType *event_type = ltt_event_eventtype(e);
   LttTime time = ltt_event_time(e);
@@ -1623,7 +1668,13 @@ static int current_time_get_first_event_hook(void *hook_data, void *call_data)
   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))
+          tfc->t_context->t,tfc,NULL,NULL))
+      return FALSE;
+
+  filter = event_viewer_data->filter;
+  if(filter != NULL && filter->head != NULL)
+    if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+          tfc->t_context->t,tfc,NULL,NULL))
       return FALSE;
 
   lttv_traceset_context_position_save(tfc->t_context->ts_context, 
@@ -1792,7 +1843,7 @@ gboolean filter_changed(void * hook_data, void * call_data)
 }
 
 
-gint redraw_notify(void *hook_data, void *call_data)
+gint evd_redraw_notify(void *hook_data, void *call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
 
@@ -1800,12 +1851,16 @@ gint redraw_notify(void *hook_data, void *call_data)
   return 0;
 }
 
-void gui_events_free(EventViewerData *event_viewer_data)
+void gui_events_free(gpointer data)
 {
-  Tab *tab = event_viewer_data->tab;
+  LttvPluginEVD *plugin_evd = (LttvPluginEVD*)data;
+  Tab *tab = plugin_evd->evd->tab;
+  EventViewerData *event_viewer_data = plugin_evd->evd;
   guint i;
  
-  if(event_viewer_data){
+  lttv_filter_destroy(plugin_evd->evd->filter);
+
+  if(tab != NULL){
     lttv_hooks_remove(event_viewer_data->event_hooks,event_hook);
     lttv_hooks_destroy(event_viewer_data->event_hooks);
     
@@ -1834,23 +1889,25 @@ void gui_events_free(EventViewerData *event_viewer_data)
     lttvwindow_unregister_filter_notify(tab,
                         filter_changed, event_viewer_data);
     lttvwindow_unregister_redraw_notify(tab,
-                redraw_notify, event_viewer_data);
+                evd_redraw_notify, event_viewer_data);
 
-    lttvwindowtraces_background_notify_remove(event_viewer_data);
-
-    g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list,
-        event_viewer_data);
-    g_free(event_viewer_data);
   }
+  lttvwindowtraces_background_notify_remove(event_viewer_data);
+
+  g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list,
+      event_viewer_data);
+  //g_free(event_viewer_data);
+  g_object_unref(plugin_evd);
 }
 
 
 
-void gui_events_destructor(EventViewerData *event_viewer_data)
+void gui_events_destructor(gpointer data)
 {
+  LttvPluginEVD *plugin_evd = (LttvPluginEVD*)data;
   /* May already been done by GTK window closing */
-  if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){
-    gtk_widget_destroy(event_viewer_data->hbox_v);
+  if(GTK_IS_WIDGET(plugin_evd->parent.top_widget)){
+    gtk_widget_destroy(plugin_evd->parent.top_widget);
   }
 }
 
@@ -1874,7 +1931,7 @@ static void init() {
 
 void event_destroy_walk(gpointer data, gpointer user_data)
 {
-  gui_events_destructor((EventViewerData*)data);
+  gui_events_destructor((LttvPluginEVD*)data);
 }
 
 /**