create directories branches, tags, trunk

[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 5350ab45115c6b3f25a8c8d486fc2092b1dda75c..f1cca3c775fff7b8f86505c4240e2fa311a396ef 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -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;
@@ -246,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                         */
@@ -346,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,
@@ -426,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);
@@ -583,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.
        */
     }
@@ -1298,7 +1287,8 @@ static gboolean events_check_handler(guint count, gboolean *stop_flag,
         widget = gtk_get_event_widget(event);
         if(widget == 
          lookup_widget(main_window_get_widget(evd->tab),
-             "StopProcessingButton")) {
+             "StopProcessingButton")
+         || widget == evd->vscroll_vc) {
           gtk_main_do_event(event);
          gdk_window_process_all_updates();
        }
@@ -1551,7 +1541,8 @@ int event_hook(void *hook_data, void *call_data)
         widget = gtk_get_event_widget(event);
         if(widget == 
          lookup_widget(main_window_get_widget(event_viewer_data->tab),
-             "StopProcessingButton")) {
+             "StopProcessingButton")
+         || widget == event_viewer_data->vscroll_vc) {
           gtk_main_do_event(event);
          gdk_window_process_all_updates();
        }
@@ -1566,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;
@@ -1602,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,
@@ -1666,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,