Change function name lttv_traceset_create_position to lttv_traceset_create_current_po...

[lttv.git] / lttv / modules / gui / detailedevents / events.c

diff --git a/lttv/modules/gui/detailedevents/events.c b/lttv/modules/gui/detailedevents/events.c
index 585acbc09b35b2cd937c515d95e84c1f1514b0fc..7d034f0da383d962aecd39803125becf3c26486c 100644 (file)
--- a/lttv/modules/gui/detailedevents/events.c
+++ b/lttv/modules/gui/detailedevents/events.c
@@ -148,7 +148,6 @@ int event_hook(void *hook_data, void *call_data);
 enum
 {
   TRACE_NAME_COLUMN,
-  TRACEFILE_NAME_COLUMN,
   CPUID_COLUMN,
   EVENT_COLUMN,
   TIME_S_COLUMN,
@@ -234,11 +233,11 @@ gui_events(LttvPluginTab *ptab)
       GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 
   event_viewer_data->currently_selected_position =
-                               lttv_traceset_create_position(ts);
+                               lttv_traceset_create_current_position(ts);
   event_viewer_data->first_event =
-                               lttv_traceset_create_position(ts);
+                               lttv_traceset_create_current_position(ts);
   event_viewer_data->last_event =
-                               lttv_traceset_create_position(ts);
+                               lttv_traceset_create_current_position(ts);
   event_viewer_data->main_win_filter = lttvwindow_get_filter(tab);
 
   event_viewer_data->update_cursor = TRUE;
@@ -252,7 +251,6 @@ gui_events(LttvPluginTab *ptab)
   event_viewer_data->store_m = gtk_list_store_new (
     N_COLUMNS,      /* Total number of columns     */
     G_TYPE_STRING,  /* Trace name                  */
-    G_TYPE_STRING,  /* Tracefile name              */
     G_TYPE_UINT,    /* CPUID                       */
     G_TYPE_STRING,  /* Event                       */
     G_TYPE_UINT,    /* Time s                      */
@@ -321,19 +319,6 @@ gui_events(LttvPluginTab *ptab)
         G_CALLBACK(header_size_allocate),
         (gpointer)event_viewer_data);
 
-
-  
-  renderer = gtk_cell_renderer_text_new ();
-  column = gtk_tree_view_column_new_with_attributes ("Tracefile",
-                 renderer,
-                 "text", TRACEFILE_NAME_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 ("CPUID",
                  renderer,
@@ -1431,7 +1416,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
 
     /* Save the first event position */
 
-    event_viewer_data->first_event = lttv_traceset_create_position(ts);
+    event_viewer_data->first_event = lttv_traceset_create_current_position(ts);
 
     time = ltt_time_from_uint64(lttv_traceset_position_get_timestamp(
                                             event_viewer_data->first_event));
@@ -1487,7 +1472,7 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
                                                event_viewer_data->pos->len - 1);
     event_viewer_data->last_event = cur_pos;
   } else
-        event_viewer_data->last_event =lttv_traceset_create_position(ts);
+        event_viewer_data->last_event =lttv_traceset_create_current_position(ts);
   
   gtk_adjustment_set_value(event_viewer_data->vadjust_c,
       event_viewer_data->previous_value);
@@ -1557,10 +1542,12 @@ int event_hook(void *hook_data, void *call_data)
   GtkTreeIter iter;
 
   GString *desc = g_string_new("");
+  GString *name = g_string_new("");
   
-  LttvTracesetPosition *pos = lttv_traceset_create_position(traceState->trace->traceset);
+  LttvTracesetPosition *pos = lttv_traceset_create_current_position(traceState->trace->traceset);
 
-  lttv_event_to_string(e, desc, TRUE);
+  lttv_event_to_string(e, desc, TRUE, FALSE);
+  lttv_event_get_name(e,name);
 
   g_info("detail : %s", desc->str);
 
@@ -1568,9 +1555,8 @@ int event_hook(void *hook_data, void *call_data)
 
   gtk_list_store_set (event_viewer_data->store_m, &iter,
         TRACE_NAME_COLUMN, "TraceName",
-        TRACEFILE_NAME_COLUMN,"TraceFile" /*traceState->trace->traceset->filename*/,
         CPUID_COLUMN, cpu,
-        EVENT_COLUMN,"EventName" /*bt_ctf_event_name(e->bt_event)*/,
+        EVENT_COLUMN,name->str,
         TIME_S_COLUMN, time.tv_sec,
         TIME_NS_COLUMN, time.tv_nsec,
         PID_COLUMN, process->pid,
@@ -1581,6 +1567,7 @@ int event_hook(void *hook_data, void *call_data)
   g_ptr_array_add(event_viewer_data->pos, pos);
   
   g_string_free(desc, TRUE);
+  g_string_free(name, TRUE);
 
   if(event_viewer_data->update_cursor) {
     if(lttv_traceset_position_compare(pos, 
@@ -1679,7 +1666,7 @@ gboolean update_current_time(void * hook_data, void * call_data)
         lttv_traceset_seek_to_position(currentPosition);
     
     event_viewer_data->currently_selected_position = 
-                                        lttv_traceset_create_position(ts);
+                                        lttv_traceset_create_current_position(ts);
 
 
   }
@@ -1752,11 +1739,11 @@ gboolean traceset_changed(void * hook_data, void * call_data)
   lttv_traceset_destroy_position(event_viewer_data->last_event);
  
   event_viewer_data->currently_selected_position =
-                                lttv_traceset_create_position(ts);
+                                lttv_traceset_create_current_position(ts);
   event_viewer_data->first_event =
-                                lttv_traceset_create_position(ts);
+                                lttv_traceset_create_current_position(ts);
   event_viewer_data->last_event =
-                                lttv_traceset_create_position(ts);
+                                lttv_traceset_create_current_position(ts);
 
   get_events(event_viewer_data->vadjust_c->value, event_viewer_data);
 #endif //babel_cleanup