create directories branches, tags, trunk
[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c
index 2e123ad6ea4b0388bad64df41fa46a268e59bc64..f1cca3c775fff7b8f86505c4240e2fa311a396ef 100644 (file)
@@ -54,9 +54,7 @@
 
 #include <ltt/ltt.h>
 #include <ltt/event.h>
-#include <ltt/type.h>
 #include <ltt/trace.h>
-#include <ltt/facility.h>
 #include <lttv/module.h>
 #include <lttv/hook.h>
 #include <lttv/tracecontext.h>
@@ -147,7 +145,6 @@ enum
   TRACEFILE_NAME_COLUMN,
   CPUID_COLUMN,
   EVENT_COLUMN,
-  FACILITY_COLUMN,
   TIME_S_COLUMN,
   TIME_NS_COLUMN,
   PID_COLUMN,
@@ -189,6 +186,7 @@ gui_events(LttvPluginTab *ptab)
   GtkCellRenderer *renderer;
   EventViewerData* event_viewer_data = g_new(EventViewerData,1);
   LttvPluginEVD *plugin_evd = g_object_new(LTTV_TYPE_PLUGIN_EVD, NULL);
+  GtkTooltips *tooltips = gtk_tooltips_new();
   plugin_evd->evd = event_viewer_data;
   Tab *tab = ptab->tab;
   event_viewer_data->tab = tab;
@@ -237,6 +235,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     */
@@ -244,7 +244,6 @@ gui_events(LttvPluginTab *ptab)
     G_TYPE_STRING,  /* Tracefile name              */
     G_TYPE_UINT,    /* CPUID                       */
     G_TYPE_STRING,  /* Event                       */
-    G_TYPE_STRING,  /* Facility                    */
     G_TYPE_UINT,    /* Time s                      */
     G_TYPE_UINT,    /* Time ns                     */
     G_TYPE_INT,     /* PID                         */
@@ -344,16 +343,6 @@ gui_events(LttvPluginTab *ptab)
   gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v),
       column);
   
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Facility",
-                 renderer,
-                 "text", FACILITY_COLUMN,
-                 NULL);
-  gtk_tree_view_column_set_alignment (column, 0.0);
-  gtk_tree_view_column_set_fixed_width (column, 120);
-  gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v),
-      column);
-
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Time (s)",
                  renderer,
@@ -424,6 +413,8 @@ gui_events(LttvPluginTab *ptab)
         "clicked",
         G_CALLBACK (filter_button),
         (gpointer)plugin_evd);
+  gtk_tool_item_set_tooltip(GTK_TOOL_ITEM(event_viewer_data->button_filter), 
+      tooltips, "Open the filter window", NULL);
   gtk_toolbar_insert(GTK_TOOLBAR(event_viewer_data->toolbar),
       event_viewer_data->button_filter,
       0);
@@ -460,6 +451,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;
@@ -505,9 +499,9 @@ gui_events(LttvPluginTab *ptab)
   
   event_viewer_data->background_info_waiting = 0;
 
+
   request_background_data(event_viewer_data);
   
-
   return event_viewer_data;
 }
 
@@ -578,7 +572,7 @@ static void request_background_data(EventViewerData *event_viewer_data)
       }
     } else {
       /* Data ready. By its nature, this viewer doesn't need to have
-       * its data ready hook called htere, because a background
+       * its data ready hook called there, because a background
        * request is always linked with a redraw.
        */
     }
@@ -1101,6 +1095,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);
@@ -1229,14 +1224,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);
-    }
+  }
   
 
 }
@@ -1280,10 +1276,24 @@ 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
@@ -1410,7 +1420,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
           events_check_handler,
           &event_viewer_data->tab->stop_foreground,
           event_viewer_data->main_win_filter,
-          event_viewer_data->filter, NULL);
+          event_viewer_data->filter, NULL, event_viewer_data);
     } else if(relative_position < 0) {
       guint count;
       
@@ -1430,7 +1440,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
          events_check_handler,
          &event_viewer_data->tab->stop_foreground,
           event_viewer_data->main_win_filter,
-          event_viewer_data->filter, NULL);
+          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);
@@ -1525,7 +1535,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;
   }
@@ -1534,18 +1557,18 @@ 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))
+          tfc->t_context->t,tfc,NULL,NULL))
       return FALSE;
 
 
-  LttFacility *facility = ltt_event_facility(e);
-  LttEventType *event_type = ltt_event_eventtype(e);
+//  LttFacility *facility = ltt_event_facility(e);
+//  LttEventType *event_type = ltt_event_eventtype(e);
   LttTime time = ltt_event_time(e);
 
   guint cpu = tfs->cpu;
@@ -1570,8 +1593,7 @@ int event_hook(void *hook_data, void *call_data)
       TRACE_NAME_COLUMN, g_quark_to_string(ltt_trace_name(tfc->t_context->t)),
       TRACEFILE_NAME_COLUMN, g_quark_to_string(ltt_tracefile_name(tfc->tf)),
       CPUID_COLUMN, cpu,
-      FACILITY_COLUMN, g_quark_to_string(ltt_facility_name(facility)),
-      EVENT_COLUMN, g_quark_to_string(ltt_eventtype_name(event_type)),
+      EVENT_COLUMN, g_quark_to_string(marker_get_info_from_id(tfc->t_context->t, e->event_id)->name),
       TIME_S_COLUMN, time.tv_sec,
       TIME_NS_COLUMN, time.tv_nsec,
       PID_COLUMN, process->pid,
@@ -1634,13 +1656,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))
+          tfc->t_context->t,tfc,NULL,NULL))
       return FALSE;
 
   lttv_traceset_context_position_save(tfc->t_context->ts_context, 
This page took 0.025878 seconds and 4 git commands to generate.