time bar fixes
[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c
index 858ca4813e814f2cc981a3974041f9c64c717ed1..c714031b35a79575ce3ac66e8be91e2f616f5b3d 100644 (file)
  * 
  * This plugin adds a Events Viewer functionnality to Linux TraceToolkit
  * GUI when this plugin is loaded. The init and destroy functions add the
- * viewer's insertion menu item and toolbar icon by calling gtkTraceSet's
+ * viewer's insertion menu item and toolbar icon by calling viewer.h's
  * API functions. Then, when a viewer's object is created, the constructor
  * creates ans register through API functions what is needed to interact
- * with the TraceSet window.
+ * with the lttvwindow.
  *
  * Authors : Mathieu Desnoyers and XangXiu Yang, June to December 2003
  *           Inspired from original LTT, made by Karim Yaghmour
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
 
-#include <lttv/module.h>
-#include <lttv/hook.h>
-#include <lttvwindow/gtktraceset.h>
-#include <lttv/tracecontext.h>
-#include <lttv/state.h>
 #include <ltt/ltt.h>
 #include <ltt/event.h>
 #include <ltt/type.h>
 #include <ltt/trace.h>
 #include <ltt/facility.h>
-#include <string.h>
-
-//#include "mw_api.h"
-#include "gtktreeprivate.h"
+#include <lttv/module.h>
+#include <lttv/hook.h>
+#include <lttv/tracecontext.h>
+#include <lttv/state.h>
+#include <lttvwindow/lttvwindow.h>
 
 #include "hGuiEventsInsert.xpm"
 
+#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
+#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
 
-static LttvHooks  *before_event;
 
 /** Array containing instanced objects. Used when module is unloaded */
 static GSList *g_event_viewer_data_list = NULL ;
 
-typedef struct _RawTraceData{
+typedef struct _EventFields{
   unsigned  cpu_id;
   char * event_name;
   LttTime time;
@@ -74,13 +71,15 @@ typedef struct _RawTraceData{
   unsigned entry_length;
   char * event_description;
   LttEventPosition *ep;
-} RawTraceData;
+} EventFields;
 
 #define RESERVE_BIG_SIZE             1000
 #define RESERVE_SMALL_SIZE           100
 #define RESERVE_SMALL_SIZE_SQUARE    RESERVE_SMALL_SIZE*RESERVE_SMALL_SIZE
 #define RESERVE_SMALL_SIZE_CUBE      RESERVE_SMALL_SIZE*RESERVE_SMALL_SIZE_SQUARE
 
+static const LttTime ltt_time_backward = { 1 , 0 };
+
 typedef enum _ScrollDirection{
   SCROLL_STEP_UP,
   SCROLL_STEP_DOWN,
@@ -92,23 +91,24 @@ typedef enum _ScrollDirection{
 
 typedef struct _EventViewerData {
 
-  MainWindow * mw;
-  TimeWindow   time_window;
-  LttTime      current_time;
-  LttvHooks  * before_event_hooks;
+  Tab * tab;
+  LttvHooks  * event_hooks;
 
-  gboolean     append;                    //prepend or append item 
-  GQueue     * raw_trace_data_queue;      //buf to contain raw trace data
-  GQueue     * raw_trace_data_queue_tmp;  //tmp buf to contain raw data
+  gboolean     append;                  // prepend or append item 
+  GQueue     * event_fields_queue;      // buf to contain event fields
+  GQueue     * event_fields_queue_tmp;  // tmp buf to contain event fields
   unsigned     current_event_index;
-  double       previous_value;            //value of the slide
-  TimeInterval time_span;
-  unsigned     start_event_index;        //the first event shown in the window
-  unsigned     end_event_index;          //the last event shown in the window
-  unsigned     size;                     //maxi number of events loaded when instance the viewer
-  gboolean     shown;                    //indicate if event detail is shown or not
+  
+  /* 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;
+  
+  unsigned     start_event_index;       // the first event shown in the window
+  unsigned     end_event_index;         // the last event shown in the window
+  unsigned     size;                    // maxi number of events loaded when instance the viewer
   gboolean     current_time_updated;
-  char *       filter_key;
 
   //scroll window containing Tree View
   GtkWidget * scroll_win;
@@ -120,10 +120,12 @@ typedef struct _EventViewerData {
   /* 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 it's adjustment */
+  /* Vertical scrollbar and its adjustment */
   GtkWidget *vscroll_vc;
-  GtkAdjustment *vadjust_c ;
+  GtkAdjustment *vadjust_c;
   
   /* Selection handler */
   GtkTreeSelection *select_c;
@@ -131,17 +133,15 @@ typedef struct _EventViewerData {
   guint num_visible_events;
   guint first_event, last_event;
   
-  /* TEST DATA, TO BE READ FROM THE TRACE */
   gint number_of_events ;
-  guint currently_selected_event  ;
+  guint currently_selected_event;
   gboolean selected_event ;
 
 } EventViewerData ;
 
 /** hook functions for update time interval, current time ... */
-gboolean update_time_window(void * hook_data, void * call_data);
 gboolean update_current_time(void * hook_data, void * call_data);
-gboolean show_event_detail(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);
 void remove_item_from_queue(GQueue * q, gboolean fromHead);
 void remove_all_items_from_queue(GQueue * q);
@@ -151,15 +151,20 @@ void remove_context_hooks(EventViewerData * event_viewer_data,
         LttvTracesetContext * tsc);
 
 //! Event Viewer's constructor hook
-GtkWidget *h_gui_events(MainWindow *parent_window, LttvTracesetSelector * s, char* key);
+GtkWidget *h_gui_events(Tab *tab, LttvTracesetSelector * s, char* key);
 //! Event Viewer's constructor
-EventViewerData *gui_events(MainWindow *parent_window, LttvTracesetSelector *s, char *key);
+EventViewerData *gui_events(Tab *tab, LttvTracesetSelector *s, char *key);
 //! Event Viewer's destructor
 void gui_events_destructor(EventViewerData *event_viewer_data);
 void gui_events_free(EventViewerData *event_viewer_data);
 
 static int event_selected_hook(void *hook_data, void *call_data);
 
+static gboolean
+header_size_allocate(GtkWidget *widget,
+                        GtkAllocation *allocation,
+                        gpointer user_data);
+
 void tree_v_set_cursor(EventViewerData *event_viewer_data);
 void tree_v_get_cursor(EventViewerData *event_viewer_data);
 
@@ -173,15 +178,16 @@ static void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint
 static void tree_v_grab_focus(GtkWidget *widget, gpointer data);
 
 
-static void get_test_data(double time, guint list_height, 
+static void get_data(double time, guint list_height, 
         EventViewerData *event_viewer_data);
 
-void add_test_data(EventViewerData *event_viewer_data);
-
 static void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size);
 
 static void get_events(EventViewerData* event_viewer_data, LttTime start, 
            LttTime end, unsigned max_num_events, unsigned * real_num_events);
+
+static int after_get_events(void *hook_data, void *call_data);
+
 static gboolean parse_event(void *hook_data, void *call_data);
 
 static LttvModule *main_win_module;
@@ -208,9 +214,9 @@ enum
  * @return The widget created.
  */
 GtkWidget *
-h_gui_events(MainWindow * parent_window, LttvTracesetSelector * s, char* key)
+h_gui_events(Tab * tab, LttvTracesetSelector * s, char* key)
 {
-  EventViewerData* event_viewer_data = gui_events(parent_window, s, key) ;
+  EventViewerData* event_viewer_data = gui_events(tab, s, key) ;
 
   if(event_viewer_data)
     return event_viewer_data->hbox_v;
@@ -225,50 +231,52 @@ h_gui_events(MainWindow * parent_window, LttvTracesetSelector * s, char* key)
  * @return The Event viewer data created.
  */
 EventViewerData *
-gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key )
+gui_events(Tab *tab, LttvTracesetSelector * s,char* key )
 {
-  LttTime start, end;
+  LttTime end;
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   EventViewerData* event_viewer_data = g_new(EventViewerData,1) ;
-  RawTraceData * data;
+  EventFields * data;
 
-  event_viewer_data->mw = parent_window;
-  get_time_window(event_viewer_data->mw, &event_viewer_data->time_window);
-  get_current_time(event_viewer_data->mw, &event_viewer_data->current_time);
+  event_viewer_data->tab = tab;
   
-  event_viewer_data->before_event_hooks = lttv_hooks_new();
-  lttv_hooks_add(event_viewer_data->before_event_hooks, parse_event, event_viewer_data);
+  event_viewer_data->event_hooks = lttv_hooks_new();
+  lttv_hooks_add(event_viewer_data->event_hooks, parse_event, event_viewer_data, LTTV_PRIO_DEFAULT);
 
-  event_viewer_data->raw_trace_data_queue     = g_queue_new();
-  event_viewer_data->raw_trace_data_queue_tmp = g_queue_new();  
+  event_viewer_data->event_fields_queue     = g_queue_new();
+  event_viewer_data->event_fields_queue_tmp = g_queue_new();  
 
-  reg_update_time_window(update_time_window,event_viewer_data, event_viewer_data->mw);
-  reg_update_current_time(update_current_time,event_viewer_data, event_viewer_data->mw);
-  reg_show_viewer(show_event_detail,event_viewer_data, event_viewer_data->mw);
-  reg_update_traceset(traceset_changed,event_viewer_data, event_viewer_data->mw);
+  lttvwindow_register_current_time_notify(tab, 
+                update_current_time,event_viewer_data);
+  //lttvwindow_register_show_notify(tab, 
+  //              show_event_detail,event_viewer_data);
+  lttvwindow_register_traceset_notify(tab, 
+                traceset_changed,event_viewer_data);
 
   event_viewer_data->scroll_win = gtk_scrolled_window_new (NULL, NULL);
-  gtk_widget_show ( event_viewer_data->scroll_win);
-  gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(event_viewer_data->scroll_win), 
-         GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
+  gtk_widget_show (event_viewer_data->scroll_win);
+  gtk_scrolled_window_set_policy(
+      GTK_SCROLLED_WINDOW(event_viewer_data->scroll_win), 
+      GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
 
   /* TEST DATA, TO BE READ FROM THE TRACE */
-  event_viewer_data->currently_selected_event = FALSE  ;
-  event_viewer_data->selected_event = 0;
+  event_viewer_data->currently_selected_event = 0;
+  event_viewer_data->selected_event = FALSE;
 
   /* Create a model for storing the data list */
   event_viewer_data->store_m = gtk_list_store_new (
-    N_COLUMNS,  /* Total number of columns */
-    G_TYPE_INT, /* CPUID                  */
-    G_TYPE_STRING,  /* Event                   */
-    G_TYPE_UINT64,  /* Time                    */
-    G_TYPE_INT, /* PID                     */
-    G_TYPE_INT, /* Entry length            */
-    G_TYPE_STRING); /* Event's description     */
+    N_COLUMNS,      /* Total number of columns     */
+    G_TYPE_INT,     /* CPUID                       */
+    G_TYPE_STRING,  /* Event                       */
+    G_TYPE_UINT64,  /* Time                        */
+    G_TYPE_INT,     /* PID                         */
+    G_TYPE_INT,     /* Entry length                */
+    G_TYPE_STRING); /* Event's description         */
   
   /* Create the viewer widget for the columned list */
-  event_viewer_data->tree_v = gtk_tree_view_new_with_model (GTK_TREE_MODEL (event_viewer_data->store_m));
+  event_viewer_data->tree_v =
+    gtk_tree_view_new_with_model (GTK_TREE_MODEL (event_viewer_data->store_m));
     
   g_signal_connect (G_OBJECT (event_viewer_data->tree_v), "size-allocate",
         G_CALLBACK (tree_v_size_allocate_cb),
@@ -309,6 +317,13 @@ gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key )
   gtk_tree_view_column_set_fixed_width (column, 45);
   gtk_tree_view_append_column (GTK_TREE_VIEW (event_viewer_data->tree_v), column);
 
+  event_viewer_data->button = column->button;
+
+  g_signal_connect (G_OBJECT(event_viewer_data->button),
+        "size-allocate",
+        G_CALLBACK(header_size_allocate),
+        (gpointer)event_viewer_data);
+
   renderer = gtk_cell_renderer_text_new ();
   column = gtk_tree_view_column_new_with_attributes ("Event",
                  renderer,
@@ -346,7 +361,7 @@ gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key )
   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 ("Event's Description",
+  column = gtk_tree_view_column_new_with_attributes ("Event Description",
                  renderer,
                  "text", EVENT_DESCR_COLUMN,
                  NULL);
@@ -406,10 +421,14 @@ gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key )
   event_viewer_data->num_visible_events = 1;
 
   //get the life span of the traceset and set the upper of the scroll bar
-  get_traceset_time_span(event_viewer_data->mw, &event_viewer_data->time_span);
   
-  start = ltt_time_sub(event_viewer_data->time_span.endTime, event_viewer_data->time_span.startTime);
-  event_viewer_data->vadjust_c->upper = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND;
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+  TimeInterval time_span = tsc->time_span;
+  end = ltt_time_sub(time_span.end_time, time_span.start_time);
+
+  event_viewer_data->vadjust_c->upper =
+              ltt_time_to_double(end) * NANOSECONDS_PER_SECOND;
 
   event_viewer_data->append = TRUE;
 
@@ -419,34 +438,34 @@ gui_events(MainWindow *parent_window, LttvTracesetSelector * s,char* key )
   /* Set the Selected Event */
   //  tree_v_set_cursor(event_viewer_data);
 
-  event_viewer_data->shown = FALSE;
   event_viewer_data->current_time_updated = FALSE;
   event_viewer_data->size  = RESERVE_SMALL_SIZE;
-  g_object_set_data(
-        G_OBJECT(event_viewer_data->hbox_v),
-        MAX_NUMBER_EVENT,
-        &event_viewer_data->size);
-/*  
-  g_object_set_data(
-        G_OBJECT(event_viewer_data->hbox_v),
-        TRACESET_TIME_SPAN,
-        &event_viewer_data->time_span);
-*/
-  event_viewer_data->filter_key = g_strdup(key);
-  g_object_set_data(
-        G_OBJECT(event_viewer_data->hbox_v),
-        event_viewer_data->filter_key,
-        s);
-  
+
   g_object_set_data_full(
       G_OBJECT(event_viewer_data->hbox_v),
       "event_viewer_data",
       event_viewer_data,
       (GDestroyNotify)gui_events_free);
   
+
   return event_viewer_data;
 }
 
+
+
+static gboolean
+header_size_allocate(GtkWidget *widget,
+                        GtkAllocation *allocation,
+                        gpointer user_data)
+{
+  EventViewerData *event_viewer_data = (EventViewerData*)user_data;
+
+  event_viewer_data->header_height = allocation->height;
+
+  return 0;
+}
+
+
 void tree_v_set_cursor(EventViewerData *event_viewer_data)
 {
   GtkTreePath *path;
@@ -478,7 +497,7 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data)
     {
       event_viewer_data->selected_event = TRUE;
       event_viewer_data->currently_selected_event =
-  event_viewer_data->first_event + indices[0];
+              event_viewer_data->first_event + indices[0];
       
     } else {
       event_viewer_data->selected_event = FALSE;
@@ -491,75 +510,80 @@ void tree_v_get_cursor(EventViewerData *event_viewer_data)
 
 
 
-void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, gpointer data)
+void tree_v_move_cursor_cb (GtkWidget *widget,
+                            GtkMovementStep arg1,
+                            gint arg2,
+                            gpointer data)
 {
   GtkTreePath *path; // = gtk_tree_path_new();
   gint *indices;
   gdouble value;
   EventViewerData *event_viewer_data = (EventViewerData*)data;
   
-  gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), &path, NULL);
+  gtk_tree_view_get_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+                            &path, NULL);
   if(path == NULL)
-    {
-      /* No prior cursor, put it at beginning of page and let the execution do */
-      path = gtk_tree_path_new_from_indices(0, -1);
-      gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-    }
-  
+  {
+    /* No prior cursor, put it at beginning of page
+     * and let the execution do */
+    path = gtk_tree_path_new_from_indices(0, -1);
+    gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v),
+                                path, NULL, FALSE);
+  }
+
   indices = gtk_tree_path_get_indices(path);
   
   value = gtk_adjustment_get_value(event_viewer_data->vadjust_c);
   
   if(arg1 == GTK_MOVEMENT_DISPLAY_LINES)
-    {
-      /* Move one line */
-      if(arg2 == 1)
   {
-    /* move one line down */
-    if(indices[0] == event_viewer_data->num_visible_events - 1)
+    /* Move one line */
+    if(arg2 == 1)
+    {
+      /* move one line down */
+      if(indices[0] == event_viewer_data->num_visible_events - 1)
       {
         if(value + event_viewer_data->num_visible_events <= 
-     event_viewer_data->number_of_events -1)
-    {
-      event_viewer_data->currently_selected_event += 1;
-      //      gtk_adjustment_set_value(event_viewer_data->vadjust_c, value+1);
-      //gtk_tree_path_free(path);
-      //path = gtk_tree_path_new_from_indices(event_viewer_data->num_visible_events-1, -1);
-      //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-      g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
-    }
+            event_viewer_data->number_of_events -1)
+        {
+          event_viewer_data->currently_selected_event += 1;
+          //      gtk_adjustment_set_value(event_viewer_data->vadjust_c, value+1);
+          //gtk_tree_path_free(path);
+          //path = gtk_tree_path_new_from_indices(event_viewer_data->num_visible_events-1, -1);
+          //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
+          g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
+        }
       }
-  } else {
-    /* Move one line up */
-    if(indices[0] == 0)
+    } else {
+      /* Move one line up */
+      if(indices[0] == 0)
       {
         if(value - 1 >= 0 )
-    {
-      event_viewer_data->currently_selected_event -= 1;
-      //      gtk_adjustment_set_value(event_viewer_data->vadjust_c, value-1);
-      //gtk_tree_path_free(path);
-      //path = gtk_tree_path_new_from_indices(0, -1);
-      //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-      g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
-    }
-        
+        {
+          event_viewer_data->currently_selected_event -= 1;
+          //      gtk_adjustment_set_value(event_viewer_data->vadjust_c, value-1);
+          //gtk_tree_path_free(path);
+          //path = gtk_tree_path_new_from_indices(0, -1);
+          //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
+          g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
+        }
       }
-  }
-      
     }
+  }
   
   if(arg1 == GTK_MOVEMENT_PAGES)
-    {
-      /* Move one page */
-      if(arg2 == 1)
   {
-    if(event_viewer_data->num_visible_events == 1)
-      value += 1 ;
-    /* move one page down */
-    if(value + event_viewer_data->num_visible_events-1 <= 
-       event_viewer_data->number_of_events )
+    /* Move one page */
+    if(arg2 == 1)
+    {
+      if(event_viewer_data->num_visible_events == 1)
+        value += 1 ;
+      /* move one page down */
+      if(value + event_viewer_data->num_visible_events-1 <= 
+                      event_viewer_data->number_of_events )
       {
-        event_viewer_data->currently_selected_event += event_viewer_data->num_visible_events-1;
+        event_viewer_data->currently_selected_event += 
+                                  event_viewer_data->num_visible_events-1;
         //        gtk_adjustment_set_value(event_viewer_data->vadjust_c,
         //               value+(event_viewer_data->num_visible_events-1));
         //gtk_tree_path_free(path);
@@ -567,67 +591,65 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2,
         //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
         g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
       }
-  } else {
-    /* Move one page up */
-    if(event_viewer_data->num_visible_events == 1)
-      value -= 1 ;
+    } else {
+      /* Move one page up */
+      if(event_viewer_data->num_visible_events == 1)
+        value -= 1 ;
 
-    if(indices[0] < event_viewer_data->num_visible_events - 2 )
+      if(indices[0] < event_viewer_data->num_visible_events - 2 )
       {
         if(value - (event_viewer_data->num_visible_events-1) >= 0)
-    {
-      event_viewer_data->currently_selected_event -= event_viewer_data->num_visible_events-1;
+        {
+          event_viewer_data->currently_selected_event -=
+                          event_viewer_data->num_visible_events-1;
       
-      //      gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-      //             value-(event_viewer_data->num_visible_events-1));
-      //gtk_tree_path_free(path);
-      //path = gtk_tree_path_new_from_indices(0, -1);
-      //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-      g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
+          //      gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+          //             value-(event_viewer_data->num_visible_events-1));
+          //gtk_tree_path_free(path);
+          //path = gtk_tree_path_new_from_indices(0, -1);
+          //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
+          g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
       
-    } else {
-      /* Go to first Event */
-      event_viewer_data->currently_selected_event == 0 ;
-      //      gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-      //             0);
-      //gtk_tree_path_free(path);
-      //path = gtk_tree_path_new_from_indices(0, -1);
-      //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-      g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
+        } else {
+          /* Go to first Event */
+          event_viewer_data->currently_selected_event == 0 ;
+          //      gtk_adjustment_set_value(event_viewer_data->vadjust_c,
+          //             0);
+          //gtk_tree_path_free(path);
+          //path = gtk_tree_path_new_from_indices(0, -1);
+          //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
+          g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
       
-    }
+        }
       }
-    
-  }
-      
     }
+  }
   
   if(arg1 == GTK_MOVEMENT_BUFFER_ENDS)
-    {
-      /* Move to the ends of the buffer */
-      if(arg2 == 1)
   {
-    /* move end of buffer */
-    event_viewer_data->currently_selected_event = event_viewer_data->number_of_events-1 ;
-    //    gtk_adjustment_set_value(event_viewer_data->vadjust_c, 
-    //           event_viewer_data->number_of_events -
-    //           event_viewer_data->num_visible_events);
-    //gtk_tree_path_free(path);
-    //path = gtk_tree_path_new_from_indices(event_viewer_data->num_visible_events-1, -1);
-    //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-    g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
-  } else {
-    /* Move beginning of buffer */
-    event_viewer_data->currently_selected_event = 0 ;
-    //    gtk_adjustment_set_value(event_viewer_data->vadjust_c, 0);
+    /* Move to the ends of the buffer */
+    if(arg2 == 1)
+    {
+      /* move end of buffer */
+      event_viewer_data->currently_selected_event =
+                            event_viewer_data->number_of_events-1 ;
+      //    gtk_adjustment_set_value(event_viewer_data->vadjust_c, 
+      //           event_viewer_data->number_of_events -
+      //           event_viewer_data->num_visible_events);
       //gtk_tree_path_free(path);
-      //path = gtk_tree_path_new_from_indices(0, -1);
+      //path = gtk_tree_path_new_from_indices(event_viewer_data->num_visible_events-1, -1);
       //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-    g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
-  }
-      
+      g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
+    } else {
+      /* Move beginning of buffer */
+      event_viewer_data->currently_selected_event = 0 ;
+      //    gtk_adjustment_set_value(event_viewer_data->vadjust_c, 0);
+        //gtk_tree_path_free(path);
+        //path = gtk_tree_path_new_from_indices(0, -1);
+        //gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
+      g_signal_stop_emission_by_name(G_OBJECT(widget), "move-cursor");
     }
-  
+  }
   
   gtk_tree_path_free(path);
 }
@@ -635,6 +657,8 @@ void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2,
 void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) data;
+  Tab *tab = event_viewer_data->tab;
+  LttTime current_time = lttvwindow_get_current_time(tab);
   LttTime ltt_time;
   guint64 time;
   GtkTreeIter iter;
@@ -651,10 +675,10 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
     ltt_time.tv_sec = time / NANOSECONDS_PER_SECOND;
     ltt_time.tv_nsec = time % NANOSECONDS_PER_SECOND;
  
-    if(ltt_time.tv_sec != event_viewer_data->current_time.tv_sec ||
-       ltt_time.tv_nsec != event_viewer_data->current_time.tv_nsec){
+    if(ltt_time.tv_sec != current_time.tv_sec ||
+       ltt_time.tv_nsec != current_time.tv_nsec){
       event_viewer_data->current_time_updated = TRUE;
-      set_current_time(event_viewer_data->mw,&ltt_time);
+      lttvwindow_report_current_time(tab,ltt_time);
     }
   }else{
     g_warning("Can not get iter\n");
@@ -668,7 +692,7 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data)
   EventViewerData *event_viewer_data = (EventViewerData*)data;
   GtkTreePath *tree_path;
 
-  get_test_data(adjustment->value, event_viewer_data->num_visible_events, 
+  get_data(adjustment->value, event_viewer_data->num_visible_events, 
     event_viewer_data);
   
   
@@ -690,8 +714,6 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data)
       //             NULL, FALSE);
       gtk_tree_path_free(tree_path);
     }
-  
 }
 
 gint get_cell_height(GtkTreeView *TreeView)
@@ -714,8 +736,8 @@ void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer
   gdouble exact_num_visible;
   
   exact_num_visible = ( alloc->height -
-      TREE_VIEW_HEADER_HEIGHT (GTK_TREE_VIEW(event_viewer_data->tree_v)) )
-    / (double)cell_height ;
+          event_viewer_data->header_height )
+            / (double)cell_height ;
   
   event_viewer_data->num_visible_events = ceil(exact_num_visible) ;
   
@@ -725,10 +747,14 @@ void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gpointer
   event_viewer_data->vadjust_c->page_size =
     floor(exact_num_visible);
 */
-  
+  g_debug("size allocate : last_num_visible_events : %lu,\
+           num_visible_events : %lu",
+           last_num_visible_events,
+           event_viewer_data->num_visible_events);
   if(event_viewer_data->num_visible_events != last_num_visible_events)
     {
-      get_test_data(event_viewer_data->vadjust_c->value,
+      get_data(event_viewer_data->vadjust_c->value,
         event_viewer_data->num_visible_events, 
         event_viewer_data);
     }
@@ -742,19 +768,19 @@ void tree_v_size_request_cb (GtkWidget *widget, GtkRequisition *requisition, gpo
   EventViewerData *event_viewer_data = (EventViewerData*)data;
   gint cell_height = get_cell_height(GTK_TREE_VIEW(event_viewer_data->tree_v));
   
-  h = cell_height + TREE_VIEW_HEADER_HEIGHT
-    (GTK_TREE_VIEW(event_viewer_data->tree_v));
+  h = cell_height + event_viewer_data->header_height;
   requisition->height = h;
   
 }
 
+#if 0
 gboolean show_event_detail(void * hook_data, void * call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
-  LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw);
+  LttvTracesetContext * tsc = lttvwindow_get_traceset_context(event_viewer_data->tab);
 
-  if(event_viewer_data->raw_trace_data_queue_tmp->length == 0 &&
-     event_viewer_data->raw_trace_data_queue->length == 0){
+  if(event_viewer_data->event_fields_queue_tmp->length == 0 &&
+     event_viewer_data->event_fields_queue->length == 0){
     event_viewer_data->shown = FALSE;
     return FALSE;
   }
@@ -762,9 +788,9 @@ gboolean show_event_detail(void * hook_data, void * call_data)
   if(event_viewer_data->shown == FALSE){
     event_viewer_data->shown = TRUE;
     update_raw_data_array(event_viewer_data, 
-        event_viewer_data->raw_trace_data_queue_tmp->length);
+        event_viewer_data->event_fields_queue_tmp->length);
 
-    get_test_data(event_viewer_data->vadjust_c->value,
+    get_data(event_viewer_data->vadjust_c->value,
       event_viewer_data->num_visible_events, 
       event_viewer_data);
 
@@ -773,19 +799,21 @@ gboolean show_event_detail(void * hook_data, void * call_data)
 
   return FALSE;
 }
+#endif //0
+
 
 void insert_data_into_model(EventViewerData *event_viewer_data, int start, int end)
 {
   int i;
   guint64 real_data;
-  RawTraceData * raw_data;
+  EventFields * raw_data;
   GList * first;
   GtkTreeIter iter;
 
-  first = event_viewer_data->raw_trace_data_queue->head;
+  first = event_viewer_data->event_fields_queue->head;
   for(i=start; i<end; i++){
     if(i>=event_viewer_data->number_of_events) break;    
-    raw_data = (RawTraceData*)g_list_nth_data(first, i);
+    raw_data = (EventFields*)g_list_nth_data(first, i);
     
     // Add a new row to the model 
     real_data = raw_data->time.tv_sec;
@@ -803,37 +831,53 @@ void insert_data_into_model(EventViewerData *event_viewer_data, int start, int e
   }
 }
 
-void get_test_data(double time_value, guint list_height, 
-       EventViewerData *event_viewer_data)
+static void get_data_wrapped(double time_value, guint list_height, 
+       EventViewerData *event_viewer_data, LttEvent *ev);
+
+static void get_data(double time_value, guint list_height,
+     EventViewerData *event_viewer_data)
+{
+  LttEvent * ev = ltt_event_new();
+
+  get_data_wrapped(time_value, list_height,
+      event_viewer_data, ev);
+
+  ltt_event_destroy(ev);
+}
+
+static void get_data_wrapped(double time_value, guint list_height, 
+       EventViewerData *event_viewer_data, LttEvent *ev)
 {
   GtkTreeIter iter;
   int i;
   GtkTreeModel *model = GTK_TREE_MODEL(event_viewer_data->store_m);
   GtkTreePath *tree_path;
-  RawTraceData * raw_data;
+  EventFields * event_fields;
   ScrollDirection  direction = SCROLL_NONE;
   GList * first;
   int event_number;
   double value = event_viewer_data->previous_value - time_value;
   LttTime start, end, time;
-  LttEvent * ev;
   unsigned backward_num, minNum, maxNum;
   LttTracefile * tf;
   unsigned  block_num, event_num;
   unsigned size = 1, count = 0;
   gboolean need_backward_again, backward;
   GdkWindow * win;
-  GdkCursor * new;
+  //GdkCursor * new;
   GtkWidget* widget = gtk_widget_get_parent(event_viewer_data->hbox_v);
-  
-  if(widget){
-    new = gdk_cursor_new(GDK_X_CURSOR);
-    win = gtk_widget_get_parent_window(widget);  
-    gdk_window_set_cursor(win, new);
-    gdk_cursor_unref(new);  
-    gdk_window_stick(win);
-    gdk_window_unstick(win);
-  }
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+  TimeInterval time_span = tsc->time_span;
+
+  //if(widget){
+  //  new = gdk_cursor_new(GDK_X_CURSOR);
+  //  win = gtk_widget_get_parent_window(widget);  
+  //  gdk_window_set_cursor(win, new);
+  //  gdk_cursor_unref(new);  
+  //  gdk_window_stick(win);
+  //  gdk_window_unstick(win);
+  //}
 
 
   //  if(event_number > event_viewer_data->last_event ||
@@ -848,15 +892,26 @@ void get_test_data(double time_value, guint list_height,
     else if(value == 0.0 ) direction = SCROLL_NONE;
     else direction = SCROLL_JUMP;
 
+    if(g_queue_get_length(event_viewer_data->event_fields_queue)==0)
+      direction = SCROLL_JUMP;
+
     switch(direction){
       case SCROLL_STEP_UP:
+        if(direction == SCROLL_STEP_UP) g_debug("direction STEP_UP");
       case SCROLL_PAGE_UP:
+        if(direction == SCROLL_PAGE_UP) g_debug("direction PAGE_UP");
   if(direction == SCROLL_PAGE_UP){
     backward = list_height>event_viewer_data->start_event_index ? TRUE : FALSE;
   }else{
     backward = event_viewer_data->start_event_index == 0 ? TRUE : FALSE;
   }
   if(backward){
+    first = event_viewer_data->event_fields_queue->head;
+    if(!first)break;
+    event_fields = (EventFields*)first->data;
+    LttTime backward_start = event_fields->time;
+
+    maxNum = RESERVE_SMALL_SIZE_CUBE;
     event_viewer_data->append = FALSE;
     do{
       if(direction == SCROLL_PAGE_UP){
@@ -864,27 +919,31 @@ void get_test_data(double time_value, guint list_height,
       }else{
         minNum = 1;
       }
-
-      first = event_viewer_data->raw_trace_data_queue->head;
+      first = event_viewer_data->event_fields_queue->head;
       if(!first)break;
-      raw_data = (RawTraceData*)g_list_nth_data(first,0);
-      end = raw_data->time;
-      end.tv_nsec--;
-      ltt_event_position_get(raw_data->ep, &block_num, &event_num, &tf);
+      event_fields = (EventFields*)first->data;
+      end = event_fields->time;
+
+      backward_start = LTT_TIME_MAX(ltt_time_sub(backward_start,
+                                                   ltt_time_backward),
+                              tsc->time_span.start_time);
+
+      /*
+      ltt_event_position_get(event_fields->ep, &block_num, &event_num, &tf);
       if(size !=0){
         if(event_num > minNum){
     backward_num = event_num > RESERVE_SMALL_SIZE 
                   ? event_num - RESERVE_SMALL_SIZE : 1;
-    ltt_event_position_set(raw_data->ep, block_num, backward_num);
-    ltt_tracefile_seek_position(tf, raw_data->ep);
-    ev = ltt_tracefile_read(tf);
+    ltt_event_position_set(event_fields->ep, block_num, backward_num);
+    ltt_tracefile_seek_position(tf, event_fields->ep);
+    g_assert(ltt_tracefile_read(tf,ev) != NULL);
     start = ltt_event_time(ev);
     maxNum = RESERVE_SMALL_SIZE_CUBE;
         }else{
     if(block_num > 1){
-      ltt_event_position_set(raw_data->ep, block_num-1, 1);
-      ltt_tracefile_seek_position(tf, raw_data->ep);
-      ev = ltt_tracefile_read(tf);
+      ltt_event_position_set(event_fields->ep, block_num-1, 1);
+      ltt_tracefile_seek_position(tf, event_fields->ep);
+      g_assert(ltt_tracefile_read(tf,ev) != NULL);
       start = ltt_event_time(ev);             
     }else{
       start.tv_sec  = 0;
@@ -894,9 +953,9 @@ void get_test_data(double time_value, guint list_height,
         }
       }else{
         if(block_num > count){
-    ltt_event_position_set(raw_data->ep, block_num-count, 1);
-    ltt_tracefile_seek_position(tf, raw_data->ep);
-    ev = ltt_tracefile_read(tf);
+    ltt_event_position_set(event_fields->ep, block_num-count, 1);
+    ltt_tracefile_seek_position(tf, event_fields->ep);
+    g_assert(ltt_tracefile_read(tf, ev) != NULL);
     start = ltt_event_time(ev);             
         }else{
     start.tv_sec  = 0;
@@ -904,12 +963,14 @@ void get_test_data(double time_value, guint list_height,
         }       
         maxNum = RESERVE_SMALL_SIZE_CUBE;
       }
+      */
 
       event_viewer_data->current_event_index = event_viewer_data->start_event_index;
-      get_events(event_viewer_data, start, end, maxNum, &size);
+      get_events(event_viewer_data, backward_start, end, maxNum, &size);
       event_viewer_data->start_event_index = event_viewer_data->current_event_index;
 
-      if(size < minNum && (start.tv_sec !=0 || start.tv_nsec !=0))
+      if(size < minNum 
+          && (ltt_time_compare(backward_start, tsc->time_span.start_time)>0))
         need_backward_again = TRUE;
       else need_backward_again = FALSE;
       if(size == 0){
@@ -925,12 +986,13 @@ void get_test_data(double time_value, guint list_height,
     event_number = event_viewer_data->start_event_index - list_height;          
   break;
       case SCROLL_STEP_DOWN:
+        g_debug("direction STEP_DOWN");
   if(event_viewer_data->end_event_index == event_viewer_data->number_of_events - 1){
     event_viewer_data->append = TRUE;
-    first = event_viewer_data->raw_trace_data_queue->head;
+    first = event_viewer_data->event_fields_queue->head;
     if(!first)break;
-    raw_data = (RawTraceData*)g_list_nth_data(first,event_viewer_data->number_of_events - 1);
-    start = raw_data->time;
+    event_fields = (EventFields*)g_list_nth_data(first,event_viewer_data->number_of_events - 1);
+    start = event_fields->time;
     start.tv_nsec++;
     end.tv_sec = G_MAXULONG;
     end.tv_nsec = G_MAXULONG;
@@ -945,15 +1007,16 @@ void get_test_data(double time_value, guint list_height,
   }else event_number = event_viewer_data->start_event_index + 1;
   break;
       case SCROLL_PAGE_DOWN:
+        g_debug("direction PAGE_DOWN");
   i = event_viewer_data->number_of_events - 1 - list_height;
   if((gint)(event_viewer_data->end_event_index) >= i){
     int remain_events = event_viewer_data->number_of_events - 1 
                         -  event_viewer_data->end_event_index;
     event_viewer_data->append = TRUE;
-    first = event_viewer_data->raw_trace_data_queue->head;
+    first = event_viewer_data->event_fields_queue->head;
     if(!first)break;
-    raw_data = (RawTraceData*)g_list_nth_data(first,event_viewer_data->number_of_events - 1);
-    start = raw_data->time;
+    event_fields = (EventFields*)g_list_nth_data(first,event_viewer_data->number_of_events - 1);
+    start = event_fields->time;
     start.tv_nsec++;
     end.tv_sec = G_MAXULONG;
     end.tv_nsec = G_MAXULONG;
@@ -971,36 +1034,44 @@ void get_test_data(double time_value, guint list_height,
   }else event_number = event_viewer_data->start_event_index + list_height - 1;
   break;
       case SCROLL_JUMP:
+        g_debug("direction SCROLL_JUMP");
   event_viewer_data->append = TRUE;
-  remove_all_items_from_queue(event_viewer_data->raw_trace_data_queue);
+  remove_all_items_from_queue(event_viewer_data->event_fields_queue);
   end.tv_sec = G_MAXULONG;
   end.tv_nsec = G_MAXULONG;
   time = ltt_time_from_double(time_value / NANOSECONDS_PER_SECOND);
-  start = ltt_time_add(event_viewer_data->time_span.startTime, time);
+  start = ltt_time_add(time_span.start_time, time);
   event_viewer_data->previous_value = time_value;
   get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE,&size);
   if(size < list_height && size > 0){
     event_viewer_data->append = FALSE;
-    first = event_viewer_data->raw_trace_data_queue->head;
+    first = event_viewer_data->event_fields_queue->head;
     if(!first)break;
-    raw_data = (RawTraceData*)g_list_nth_data(first,0);
-    end = raw_data->time;
-    end.tv_nsec--;
-    ltt_event_position_get(raw_data->ep, &block_num, &event_num, &tf);
+    event_fields = (EventFields*)first->data;
+    end = event_fields->time;
+    if(end.tv_nsec != 0)
+      end.tv_nsec--;
+    else {
+      g_assert(end.tv_sec != 0);
+      end.tv_sec--;
+      end.tv_nsec = NANOSECONDS_PER_SECOND-1;
+    }
+      
+    ltt_event_position_get(event_fields->ep, &block_num, &event_num, &tf);
     
     if(event_num > list_height - size){
       backward_num = event_num > RESERVE_SMALL_SIZE 
         ? event_num - RESERVE_SMALL_SIZE : 1;
-      ltt_event_position_set(raw_data->ep, block_num, backward_num);
-      ltt_tracefile_seek_position(tf, raw_data->ep);
-      ev = ltt_tracefile_read(tf);
+      ltt_event_position_set(event_fields->ep, block_num, backward_num);
+      ltt_tracefile_seek_position(tf, event_fields->ep);
+      g_assert(ltt_tracefile_read(tf,ev) != NULL);
       start = ltt_event_time(ev);
       maxNum = RESERVE_SMALL_SIZE_CUBE;
       event_viewer_data->current_event_index = 0;
       get_events(event_viewer_data, start, end, maxNum, &size);
       event_viewer_data->start_event_index = event_viewer_data->current_event_index;
     }
-    event_number = event_viewer_data->raw_trace_data_queue->length - list_height;
+    event_number = event_viewer_data->event_fields_queue->length - list_height;
   }else if(size == 0){
     get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_SQUARE,&size);
     if(size == 0)
@@ -1011,6 +1082,7 @@ void get_test_data(double time_value, guint list_height,
   }
   break;
       case SCROLL_NONE:
+        g_debug("direction SCROLL_NONE");
   event_number = event_viewer_data->current_event_index;
   break;
       default:
@@ -1021,14 +1093,18 @@ void get_test_data(double time_value, guint list_height,
 
     //update the value of the scroll bar
     if(direction != SCROLL_NONE && direction != SCROLL_JUMP){
-      first = event_viewer_data->raw_trace_data_queue->head;
+        g_debug("updating scrollbar value because near.");
+      first = event_viewer_data->event_fields_queue->head;
       if(first){
-  raw_data = (RawTraceData*)g_list_nth_data(first,event_number);
-  if(!raw_data) raw_data = (RawTraceData*)g_list_nth_data(first,0);       
-  time = ltt_time_sub(raw_data->time, event_viewer_data->time_span.startTime);
+  event_fields = (EventFields*)g_list_nth_data(first,event_number);
+  if(!event_fields) event_fields = (EventFields*)g_list_nth_data(first,0);       
+  time = ltt_time_sub(event_fields->time, time_span.start_time);
   event_viewer_data->vadjust_c->value = ltt_time_to_double(time) * NANOSECONDS_PER_SECOND;
-  g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed");
+  //gtk_adjustment_set_value(event_viewer_data->vadjust_c, 
+  //                         ltt_time_to_double(time) * NANOSECONDS_PER_SECOND);
+  //g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed");
   event_viewer_data->previous_value = event_viewer_data->vadjust_c->value;
+  //gtk_adjustment_value_changed(event_viewer_data->vadjust_c);
       }
     }
     
@@ -1039,7 +1115,7 @@ void get_test_data(double time_value, guint list_height,
       event_viewer_data->end_event_index = event_viewer_data->number_of_events - 1;
     }
 
-    first = event_viewer_data->raw_trace_data_queue->head;
+    first = event_viewer_data->event_fields_queue->head;
     gtk_list_store_clear(event_viewer_data->store_m);
     if(!first){
       //      event_viewer_data->previous_value = 0;
@@ -1112,11 +1188,11 @@ void get_test_data(double time_value, guint list_height,
   event_viewer_data->last_event = event_viewer_data->end_event_index ;
 
  LAST:
-  if(widget)
-     gdk_window_set_cursor(win, NULL);  
+  return;
+ // if(widget)
+ //    gdk_window_set_cursor(win, NULL);  
 
 }
-  
 
 void add_test_data(EventViewerData *event_viewer_data)
 {
@@ -1138,24 +1214,27 @@ void add_test_data(EventViewerData *event_viewer_data)
     }
   
 }
-  
+
 void
 gui_events_free(EventViewerData *event_viewer_data)
 {
+  Tab *tab = event_viewer_data->tab;
+
   if(event_viewer_data){
-    lttv_hooks_remove(event_viewer_data->before_event_hooks,parse_event);
-    lttv_hooks_destroy(event_viewer_data->before_event_hooks);
+    lttv_hooks_remove(event_viewer_data->event_hooks,parse_event);
+    lttv_hooks_destroy(event_viewer_data->event_hooks);
     
-    remove_all_items_from_queue (event_viewer_data->raw_trace_data_queue);
-    g_queue_free(event_viewer_data->raw_trace_data_queue);
-    g_queue_free(event_viewer_data->raw_trace_data_queue_tmp);
+    remove_all_items_from_queue (event_viewer_data->event_fields_queue);
+    g_queue_free(event_viewer_data->event_fields_queue);
+    g_queue_free(event_viewer_data->event_fields_queue_tmp);
 
-    unreg_update_time_window(update_time_window,event_viewer_data, event_viewer_data->mw);
-    unreg_update_current_time(update_current_time,event_viewer_data, event_viewer_data->mw);
-    unreg_show_viewer(show_event_detail,event_viewer_data, event_viewer_data->mw);
-    unreg_update_traceset(traceset_changed,event_viewer_data, event_viewer_data->mw);
+    lttvwindow_unregister_current_time_notify(tab,
+                        update_current_time, event_viewer_data);
+    //lttvwindow_unregister_show_notify(tab,
+    //                    show_event_detail, event_viewer_data);
+    lttvwindow_unregister_traceset_notify(tab,
+                        traceset_changed, event_viewer_data);
 
-    g_free(event_viewer_data->filter_key);
     g_event_viewer_data_list = g_slist_remove(g_event_viewer_data_list, event_viewer_data);
     g_free(event_viewer_data);
   }
@@ -1214,6 +1293,7 @@ int event_selected_hook(void *hook_data, void *call_data)
 
 }
 
+#if 0
 /* If every module uses the filter, maybe these two 
  * (add/remove_context_hooks functions) should be put in common place
  */
@@ -1225,16 +1305,9 @@ void add_context_hooks(EventViewerData * event_viewer_data,
   LttTrace *trace;
   LttvTraceContext *tc;
   LttvTracefileContext *tfc;
-  LttvTracesetSelector  * ts_s;
-  LttvTraceSelector     * t_s;
-  LttvTracefileSelector * tf_s;
   gboolean selected;
   LttFacility           * fac;
   LttEventType          * et;
-  LttvEventtypeSelector * eventtype;
-
-  ts_s = (LttvTracesetSelector*)g_object_get_data(G_OBJECT(event_viewer_data->hbox_v), 
-              event_viewer_data->filter_key);
 
   //if there are hooks for traceset, add them here
   
@@ -1258,7 +1331,7 @@ void add_context_hooks(EventViewerData * event_viewer_data,
       
       //if there are hooks for tracefile, add them here
       //      lttv_tracefile_context_add_hooks(tfc, NULL,NULL,NULL,NULL,
-      //               event_viewer_data->before_event_hooks,NULL);
+      //               event_viewer_data->event_hooks,NULL);
 
       nb_facility = ltt_trace_facility_number(trace);
       n = 0;
@@ -1272,8 +1345,7 @@ void add_context_hooks(EventViewerData * event_viewer_data,
     if(selected){
       id = (gint) ltt_eventtype_id(et);
       lttv_tracefile_context_add_hooks_by_id(tfc,id, 
-               event_viewer_data->before_event_hooks,
-               NULL);
+               event_viewer_data->event_hooks);
     }
     n++;
   }
@@ -1283,8 +1355,8 @@ void add_context_hooks(EventViewerData * event_viewer_data,
   }
   
   //add hooks for process_traceset
-  //    context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
-  //        NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);  
+  //    lttv_traceset_context_add_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
+  //        NULL, NULL, NULL,event_viewer_data->event_hooks,NULL);  
 }
 
 
@@ -1329,7 +1401,7 @@ void remove_context_hooks(EventViewerData * event_viewer_data,
       
       //if there are hooks for tracefile, remove them here
       //      lttv_tracefile_context_remove_hooks(tfc, NULL,NULL,NULL,NULL,
-      //            event_viewer_data->before_event_hooks,NULL);
+      //            event_viewer_data->event_hooks,NULL);
 
       nb_facility = ltt_trace_facility_number(trace);
       n = 0;
@@ -1350,43 +1422,32 @@ void remove_context_hooks(EventViewerData * event_viewer_data,
     }
   }
   //remove hooks from context
-  //    context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
-  //           NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);
-}
-
-
-gboolean update_time_window(void * hook_data, void * call_data)
-{
-  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
-  LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw);
-
-  if(event_viewer_data->shown == FALSE){
-    event_viewer_data->time_window = *(TimeWindow*)call_data;
-    
-    add_context_hooks(event_viewer_data, tsc);
-  }
-
-  return FALSE;
+  //    lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
+  //           NULL, NULL, NULL,event_viewer_data->event_hooks,NULL);
 }
+#endif //0
 
 gboolean update_current_time(void * hook_data, void * call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
-  event_viewer_data->current_time = *(LttTime*)call_data;
-  guint64 nsec = event_viewer_data->current_time.tv_sec * NANOSECONDS_PER_SECOND 
-                  + event_viewer_data->current_time.tv_nsec;
+  const LttTime * current_time = (LttTime*)call_data;
+  guint64 nsec = current_time->tv_sec * NANOSECONDS_PER_SECOND 
+                  + current_time->tv_nsec;
   GtkTreeIter iter;
   guint64 time;
   int count = -1;
   GtkTreeModel* model = (GtkTreeModel*)event_viewer_data->store_m;
   GList * list;
-  RawTraceData * data, *data1;
+  EventFields * data, *data1;
   GtkTreePath* path;
   char str_path[64];
   int i, j;
   LttTime t;
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+  TimeInterval time_span = tsc->time_span;
 
-  if(!event_viewer_data->raw_trace_data_queue->head) return FALSE;
+  if(!event_viewer_data->event_fields_queue->head) return FALSE;
 
   if(event_viewer_data->current_time_updated ){
     event_viewer_data->current_time_updated = FALSE;
@@ -1414,36 +1475,40 @@ gboolean update_current_time(void * hook_data, void * call_data)
   if(count == -1){
     count = 0;
     //check if the event is in the buffer
-    list = event_viewer_data->raw_trace_data_queue->head;
-    data = (RawTraceData*)g_list_nth_data(list,0);
-    data1 = (RawTraceData*)g_list_nth_data(list,event_viewer_data->raw_trace_data_queue->length-1);
+    list = event_viewer_data->event_fields_queue->head;
+    data = (EventFields*)g_list_nth_data(list,0);
+    data1 = (EventFields*)g_list_nth_data(list,event_viewer_data->event_fields_queue->length-1);
 
     //the event is in the buffer
-    if(ltt_time_compare(data->time, event_viewer_data->current_time)<=0 &&
-       ltt_time_compare(data1->time, event_viewer_data->current_time)>=0){
-      for(i=0;i<event_viewer_data->raw_trace_data_queue->length;i++){
-  data = (RawTraceData*)g_list_nth_data(list,i);
-  if(ltt_time_compare(data->time, event_viewer_data->current_time) < 0){
+    if(ltt_time_compare(data->time, *current_time)<=0 &&
+       ltt_time_compare(data1->time, *current_time)>=0){
+      for(i=0;i<event_viewer_data->event_fields_queue->length;i++){
+  data = (EventFields*)g_list_nth_data(list,i);
+  if(ltt_time_compare(data->time, *current_time) < 0){
     count++;
     continue;
   }
   break;
       }
-      if(event_viewer_data->raw_trace_data_queue->length-count < event_viewer_data->num_visible_events){
-  j = event_viewer_data->raw_trace_data_queue->length - event_viewer_data->num_visible_events;
+      if(event_viewer_data->event_fields_queue->length-count < event_viewer_data->num_visible_events){
+  j = event_viewer_data->event_fields_queue->length - event_viewer_data->num_visible_events;
   count -= j;
-  data = (RawTraceData*)g_list_nth_data(list,j);
+  data = (EventFields*)g_list_nth_data(list,j);
       }else{
   j = count;
   count = 0;
       }
-      t = ltt_time_sub(data->time, event_viewer_data->time_span.startTime);
+      t = ltt_time_sub(data->time, time_span.start_time);
       event_viewer_data->vadjust_c->value = ltt_time_to_double(t) * NANOSECONDS_PER_SECOND;
-      g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed");
+      //gtk_adjustment_set_value(event_viewer_data->vadjust_c, 
+      //                         ltt_time_to_double(t) * NANOSECONDS_PER_SECOND);
+      //g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->vadjust_c), "value-changed");
       event_viewer_data->previous_value = event_viewer_data->vadjust_c->value;
-      insert_data_into_model(event_viewer_data,j, j+event_viewer_data->num_visible_events);      
+      insert_data_into_model(event_viewer_data,j, j+event_viewer_data->num_visible_events); 
+      //gtk_adjustment_value_changed(event_viewer_data->vadjust_c);
+
     }else{//the event is not in the buffer
-      LttTime start = ltt_time_sub(event_viewer_data->current_time, event_viewer_data->time_span.startTime);
+      LttTime start = ltt_time_sub(*current_time, time_span.start_time);
       double position = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND;
       gtk_adjustment_set_value(event_viewer_data->vadjust_c, position);
     }
@@ -1452,7 +1517,7 @@ gboolean update_current_time(void * hook_data, void * call_data)
   sprintf(str_path,"%d\0",count);
   path = gtk_tree_path_new_from_string (str_path);
   gtk_tree_view_set_cursor(GTK_TREE_VIEW(event_viewer_data->tree_v), path, NULL, FALSE);
-  g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->tree_v), "cursor-changed");
+  //g_signal_stop_emission_by_name(G_OBJECT(event_viewer_data->tree_v), "cursor-changed");
   gtk_tree_path_free(path);  
 
   return FALSE;
@@ -1461,16 +1526,18 @@ gboolean update_current_time(void * hook_data, void * call_data)
 gboolean traceset_changed(void * hook_data, void * call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
-  LttTime start;
+  LttvTracesetContext * tsc =
+        lttvwindow_get_traceset_context(event_viewer_data->tab);
+  TimeInterval time_span = tsc->time_span;
   
-  remove_all_items_from_queue(event_viewer_data->raw_trace_data_queue);
+  LttTime end;
+  remove_all_items_from_queue(event_viewer_data->event_fields_queue);
   gtk_list_store_clear(event_viewer_data->store_m);
-  event_viewer_data->shown = FALSE;
   event_viewer_data->append = TRUE;
 
-  get_traceset_time_span(event_viewer_data->mw, &event_viewer_data->time_span);
-  start = ltt_time_sub(event_viewer_data->time_span.endTime, event_viewer_data->time_span.startTime);
-  event_viewer_data->vadjust_c->upper = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND;
+  end = ltt_time_sub(time_span.end_time, time_span.start_time);
+  event_viewer_data->vadjust_c->upper = ltt_time_to_double(end) * NANOSECONDS_PER_SECOND;
+  g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed");
   //  event_viewer_data->vadjust_c->value = 0;
 
   return FALSE;
@@ -1479,13 +1546,13 @@ gboolean traceset_changed(void * hook_data, void * call_data)
 
 void tree_v_grab_focus(GtkWidget *widget, gpointer data){
   EventViewerData *event_viewer_data = (EventViewerData *)data;
-  MainWindow * mw = event_viewer_data->mw;
-  set_focused_pane(mw, gtk_widget_get_parent(event_viewer_data->hbox_v));
+  Tab * tab = event_viewer_data->tab;
+  lttvwindow_report_focus(tab, event_viewer_data->hbox_v);
 }
 
 void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
 {
-  RawTraceData * data;
+  EventFields * data;
   if(size > 0){
     int pid, tmpPid, i,j,len;
     GList * list, *tmpList;
@@ -1495,18 +1562,18 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
     tmp_pid_array = g_array_sized_new(FALSE, TRUE, sizeof(int), 10);
 
     //if the queue is full, remove some data, keep the size of the queue constant
-    while(event_viewer_data->raw_trace_data_queue->length + size > RESERVE_BIG_SIZE){
-      remove_item_from_queue(event_viewer_data->raw_trace_data_queue,
+    while(event_viewer_data->event_fields_queue->length + size > RESERVE_BIG_SIZE){
+      remove_item_from_queue(event_viewer_data->event_fields_queue,
            event_viewer_data->append);
     }
 
     //update pid if it is not known
-    if(event_viewer_data->raw_trace_data_queue->length > 0){
-      list    = event_viewer_data->raw_trace_data_queue->head;
-      tmpList = event_viewer_data->raw_trace_data_queue_tmp->head;
+    if(event_viewer_data->event_fields_queue->length > 0){
+      list    = event_viewer_data->event_fields_queue->head;
+      tmpList = event_viewer_data->event_fields_queue_tmp->head;
       if(event_viewer_data->append){
-  for(i= event_viewer_data->raw_trace_data_queue->length-1;i>=0;i--){
-    data = (RawTraceData*)g_list_nth_data(list,i);
+  for(i= event_viewer_data->event_fields_queue->length-1;i>=0;i--){
+    data = (EventFields*)g_list_nth_data(list,i);
     len = data->pid==0 ? -2 : data->pid;
     if(data->cpu_id+1 > pid_array->len){
       pid_array = g_array_set_size(pid_array,data->cpu_id+1);     
@@ -1521,8 +1588,8 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
     }   
   }
 
-  for(i=0;i<event_viewer_data->raw_trace_data_queue_tmp->length;i++){
-    data = (RawTraceData*)g_list_nth_data(tmpList,i);
+  for(i=0;i<event_viewer_data->event_fields_queue_tmp->length;i++){
+    data = (EventFields*)g_list_nth_data(tmpList,i);
     len = data->pid==0 ? -2 : data->pid;
     if(data->cpu_id+1 > tmp_pid_array->len){
       tmp_pid_array = g_array_set_size(tmp_pid_array,data->cpu_id+1);     
@@ -1537,8 +1604,8 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
     }   
   }
       }else{
-  for(i=0;i<event_viewer_data->raw_trace_data_queue->length;i++){
-    data = (RawTraceData*)g_list_nth_data(list,i);
+  for(i=0;i<event_viewer_data->event_fields_queue->length;i++){
+    data = (EventFields*)g_list_nth_data(list,i);
     len = data->pid==0 ? -2 : data->pid;
     if(data->cpu_id+1 > pid_array->len){
       pid_array = g_array_set_size(pid_array,data->cpu_id+1);     
@@ -1553,8 +1620,8 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
     }   
   }
 
-  for(i=event_viewer_data->raw_trace_data_queue_tmp->length-1;i>=0;i--){
-    data = (RawTraceData*)g_list_nth_data(tmpList,i);
+  for(i=event_viewer_data->event_fields_queue_tmp->length-1;i>=0;i--){
+    data = (EventFields*)g_list_nth_data(tmpList,i);
     len = data->pid==0 ? -2 : data->pid;
     if(data->cpu_id+1 > tmp_pid_array->len){
       tmp_pid_array = g_array_set_size(tmp_pid_array,data->cpu_id+1);     
@@ -1578,13 +1645,13 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
   if(tmpPid == -2) tmpPid = 0;
   
   if(pid == -1 && tmpPid != -1){
-    for(i=0;i<event_viewer_data->raw_trace_data_queue->length;i++){
-      data = (RawTraceData*)g_list_nth_data(list,i);
+    for(i=0;i<event_viewer_data->event_fields_queue->length;i++){
+      data = (EventFields*)g_list_nth_data(list,i);
       if(data->pid == -1 && data->cpu_id == j) data->pid = tmpPid;
     }
   }else if(pid != -1 && tmpPid == -1){
-    for(i=0;i<event_viewer_data->raw_trace_data_queue_tmp->length;i++){
-      data = (RawTraceData*)g_list_nth_data(tmpList,i);
+    for(i=0;i<event_viewer_data->event_fields_queue_tmp->length;i++){
+      data = (EventFields*)g_list_nth_data(tmpList,i);
       if(data->pid == -1 && data->cpu_id == j) data->pid = pid;
     }
   }
@@ -1595,19 +1662,19 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
     g_array_free(tmp_pid_array, TRUE);
 
     //add data from tmp queue into the queue
-    event_viewer_data->number_of_events = event_viewer_data->raw_trace_data_queue->length 
-                                        + event_viewer_data->raw_trace_data_queue_tmp->length;
+    event_viewer_data->number_of_events = event_viewer_data->event_fields_queue->length 
+                                        + event_viewer_data->event_fields_queue_tmp->length;
     if(event_viewer_data->append){
-      if(event_viewer_data->raw_trace_data_queue->length > 0)
-  event_viewer_data->current_event_index = event_viewer_data->raw_trace_data_queue->length - 1;
+      if(event_viewer_data->event_fields_queue->length > 0)
+  event_viewer_data->current_event_index = event_viewer_data->event_fields_queue->length - 1;
       else event_viewer_data->current_event_index = 0;
-      while((data = g_queue_pop_head(event_viewer_data->raw_trace_data_queue_tmp)) != NULL){
-  g_queue_push_tail(event_viewer_data->raw_trace_data_queue, data);
+      while((data = g_queue_pop_head(event_viewer_data->event_fields_queue_tmp)) != NULL){
+  g_queue_push_tail(event_viewer_data->event_fields_queue, data);
       }
     }else{
-      event_viewer_data->current_event_index += event_viewer_data->raw_trace_data_queue_tmp->length;
-      while((data = g_queue_pop_tail(event_viewer_data->raw_trace_data_queue_tmp)) != NULL){
-  g_queue_push_head(event_viewer_data->raw_trace_data_queue, data);
+      event_viewer_data->current_event_index += event_viewer_data->event_fields_queue_tmp->length;
+      while((data = g_queue_pop_tail(event_viewer_data->event_fields_queue_tmp)) != NULL){
+  g_queue_push_head(event_viewer_data->event_fields_queue, data);
       }
     }
   }
@@ -1616,24 +1683,109 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
 void get_events(EventViewerData* event_viewer_data, LttTime start, 
     LttTime end,unsigned max_num_events, unsigned * real_num_events)
 {
-  int size;
-  LttvTracesetContext * tsc = get_traceset_context(event_viewer_data->mw);
+  LttvTracesetContext * tsc = lttvwindow_get_traceset_context(event_viewer_data->tab);
+  Tab *tab = event_viewer_data->tab;
+
+  //add_context_hooks(event_viewer_data,tsc);
+  //seek state because we use the main window's traceset context.
+  lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc), start);
+  lttv_process_traceset_middle(tsc, start, G_MAXUINT, NULL);
+  lttv_process_traceset_begin(tsc,
+                              NULL,
+                              NULL,
+                              NULL,
+                              event_viewer_data->event_hooks,
+                              NULL);
+  if(event_viewer_data->append == TRUE) {
+    /* append data */
+    lttv_process_traceset_middle(tsc, end, max_num_events, NULL);
+  } else{
+    guint count;
+    LttvTracefileContext *tfc;
+    /* prepend data */
+    do {
+      /* clear the temp list */
+      while(g_queue_pop_head(event_viewer_data->event_fields_queue_tmp));
+      /* read max_num events max */
+      count = lttv_process_traceset_middle(tsc, end, max_num_events, NULL);
+      /* loop if reached the max number of events to read, but not
+       * if end of trace or end time reached.*/
+      tfc = lttv_traceset_context_get_current_tfc(tsc);
+    } while(max_num_events == count 
+             && (tfc != NULL && ltt_time_compare(tfc->timestamp, end) < 0));
 
-  //  context_add_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
-  //      NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);
-  add_context_hooks(event_viewer_data,tsc);
+  }
+  
+  //remove_context_hooks(event_viewer_data,tsc);
+  lttv_process_traceset_end(tsc,
+                            NULL,
+                            NULL,
+                            NULL,
+                            event_viewer_data->event_hooks,
+                            NULL);
+  int size;
 
-  process_traceset_api(event_viewer_data->mw, start, end, max_num_events);
+  size = event_viewer_data->event_fields_queue_tmp->length;
+  *real_num_events = size;
+  
+  update_raw_data_array(event_viewer_data,size);
 
-  remove_context_hooks(event_viewer_data,tsc);
-  //  context_remove_hooks_api(event_viewer_data->mw, NULL, NULL, NULL, NULL, NULL, NULL,
-  //         NULL, NULL, NULL,event_viewer_data->before_event_hooks,NULL);
+#if 0
+  EventsRequest *events_request = g_new(EventsRequest, 1);
+  // Create the hooks
+  LttvHooks *event = lttv_hooks_new();
+  LttvHooks *after_request = lttv_hooks_new();
+
+  lttv_hooks_add(after_request,
+                 after_get_events,
+                 events_request,
+                 LTTV_PRIO_DEFAULT);
+  lttv_hooks_add(event,
+                 parse_event,
+                 event_viewer_data,
+                 LTTV_PRIO_DEFAULT);
+
+  // Fill the events request
+  events_request->owner = event_viewer_data;
+  events_request->viewer_data = event_viewer_data;
+  events_request->servicing = FALSE;
+  events_request->start_time = start;
+  events_request->start_position = NULL;
+  events_request->stop_flag = FALSE;
+  events_request->end_time = ltt_time_infinite;
+  events_request->num_events = max_num_events;
+  events_request->end_position = NULL;
+  events_request->before_chunk_traceset = NULL;
+  events_request->before_chunk_trace = NULL;
+  events_request->before_chunk_tracefile = NULL;
+  events_request->event = event;
+  events_request->event_by_id = NULL;
+  events_request->after_chunk_tracefile = NULL;
+  events_request->after_chunk_trace = NULL;
+  events_request->after_chunk_traceset = NULL;
+  events_request->before_request = NULL;
+  events_request->after_request = after_request;
+
+  g_debug("req : start : %u, %u", start.tv_sec, 
+                                      start.tv_nsec);
+
+  lttvwindow_events_request_remove_all(tab,
+                                       event_viewer_data);
+  lttvwindow_events_request(tab, events_request);
+#endif //0
+}
+#if 0
+static int after_get_events(void *hook_data, void *call_data)
+{  
+  EventViewerData *event_viewer_data = (EventViewerData *)hook_data;
+  int size;
 
-  size = event_viewer_data->raw_trace_data_queue_tmp->length;
+  size = event_viewer_data->event_fields_queue_tmp->length;
   *real_num_events = size;
   
   update_raw_data_array(event_viewer_data,size);
 }
+#endif //0
 
 static void get_event_detail(LttEvent *e, LttField *f, GString * s)
 {
@@ -1672,7 +1824,7 @@ static void get_event_detail(LttEvent *e, LttField *f, GString * s)
       element = ltt_field_element(f);
       for(i = 0 ; i < nb ; i++) {
         ltt_event_field_element_select(e,f,i);
-  get_event_detail(e, element, s);
+        get_event_detail(e, element, s);
       }
       g_string_append_printf(s, " }");
       break;
@@ -1682,8 +1834,8 @@ static void get_event_detail(LttEvent *e, LttField *f, GString * s)
       nb = ltt_type_member_number(type);
       for(i = 0 ; i < nb ; i++) {
         element = ltt_field_member(f,i);
-  ltt_type_member_type(type, i, &name);
-  g_string_append_printf(s, " %s = ", name);        
+        ltt_type_member_type(type, i, &name);
+        g_string_append_printf(s, " %s = ", name);        
         get_event_detail(e, element, s);
       }
       g_string_append_printf(s, " }");
@@ -1718,7 +1870,7 @@ gboolean parse_event(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
   LttvTracefileState *tfs = (LttvTracefileState *)call_data;
 
-  RawTraceData * tmp_raw_trace_data,*prev_raw_trace_data = NULL, *data=NULL;
+  EventFields * tmp_event_fields,*prev_event_fields = NULL, *data=NULL;
   LttEvent *e;
   LttTime time;
   LttField * field;
@@ -1731,66 +1883,66 @@ gboolean parse_event(void *hook_data, void *call_data)
   field = ltt_event_field(e);
   time = ltt_event_time(e);
 
-  tmp_raw_trace_data = g_new(RawTraceData,1);
-  tmp_raw_trace_data->cpu_id = ltt_event_cpu_id(e);
-  tmp_raw_trace_data->event_name = g_strdup(ltt_eventtype_name(ltt_event_eventtype(e)));
-  tmp_raw_trace_data->time = time;
-  tmp_raw_trace_data->ep = ltt_event_position_new();
-
-  if(event_viewer_data->raw_trace_data_queue_tmp->length){ 
-    list = event_viewer_data->raw_trace_data_queue_tmp->head;
-    for(i=event_viewer_data->raw_trace_data_queue_tmp->length-1;i>=0;i--){
-      data = (RawTraceData *)g_list_nth_data(list,i);
-      if(data->cpu_id == tmp_raw_trace_data->cpu_id){
-  prev_raw_trace_data = data;
+  tmp_event_fields = g_new(EventFields,1);
+  tmp_event_fields->cpu_id = ltt_event_cpu_id(e);
+  tmp_event_fields->event_name = g_strdup(ltt_eventtype_name(ltt_event_eventtype(e)));
+  tmp_event_fields->time = time;
+  tmp_event_fields->ep = ltt_event_position_new();
+
+  if(event_viewer_data->event_fields_queue_tmp->length){ 
+    list = event_viewer_data->event_fields_queue_tmp->head;
+    for(i=event_viewer_data->event_fields_queue_tmp->length-1;i>=0;i--){
+      data = (EventFields *)g_list_nth_data(list,i);
+      if(data->cpu_id == tmp_event_fields->cpu_id){
+  prev_event_fields = data;
   break;
       }
     }    
   }  
 
-  if(prev_raw_trace_data) tmp_raw_trace_data->pid = prev_raw_trace_data->pid;
-  else tmp_raw_trace_data->pid = -1;
+  if(prev_event_fields) tmp_event_fields->pid = prev_event_fields->pid;
+  else tmp_event_fields->pid = -1;
 
-  tmp_raw_trace_data->entry_length = field == NULL ? 0 : ltt_field_size(field);
+  tmp_event_fields->entry_length = field == NULL ? 0 : ltt_field_size(field);
   if(field) get_event_detail(e, field, detail_event);
-  tmp_raw_trace_data->event_description  = g_strdup(detail_event->str);
+  tmp_event_fields->event_description  = g_strdup(detail_event->str);
 
-  if(strcmp(tmp_raw_trace_data->event_name, "schedchange") == 0){
+  if(strcmp(tmp_event_fields->event_name, "schedchange") == 0){
     get_pid(&in, &out, detail_event->str);
   }
 
 
   if(in != 0 || out != 0){
-    tmp_raw_trace_data->pid = in;
-    if(prev_raw_trace_data && prev_raw_trace_data->pid == -1){
-      list = event_viewer_data->raw_trace_data_queue_tmp->head;
-      for(i=0;i<event_viewer_data->raw_trace_data_queue_tmp->length;i++){
-  data = (RawTraceData *)g_list_nth_data(list,i);
-  if(data->cpu_id == tmp_raw_trace_data->cpu_id){
+    tmp_event_fields->pid = in;
+    if(prev_event_fields && prev_event_fields->pid == -1){
+      list = event_viewer_data->event_fields_queue_tmp->head;
+      for(i=0;i<event_viewer_data->event_fields_queue_tmp->length;i++){
+  data = (EventFields *)g_list_nth_data(list,i);
+  if(data->cpu_id == tmp_event_fields->cpu_id){
     data->pid = out;
   }
       }
     }
   }
   
-  ltt_event_position(e, tmp_raw_trace_data->ep);
+  ltt_event_position(e, tmp_event_fields->ep);
 
-  if(event_viewer_data->raw_trace_data_queue_tmp->length >= RESERVE_SMALL_SIZE){
+  if(event_viewer_data->event_fields_queue_tmp->length >= RESERVE_SMALL_SIZE){
     if(event_viewer_data->append){
-      list = g_list_last(event_viewer_data->raw_trace_data_queue_tmp->head);
-      data = (RawTraceData *)(list->data);
+      list = g_list_last(event_viewer_data->event_fields_queue_tmp->head);
+      data = (EventFields *)(list->data);
       if(data->time.tv_sec  == time.tv_sec &&
    data->time.tv_nsec == time.tv_nsec){
-  g_queue_push_tail(event_viewer_data->raw_trace_data_queue_tmp,tmp_raw_trace_data);      
+  g_queue_push_tail(event_viewer_data->event_fields_queue_tmp,tmp_event_fields);      
       }else{
-  g_free(tmp_raw_trace_data);          
+  g_free(tmp_event_fields);          
       }
     }else{
-      remove_item_from_queue(event_viewer_data->raw_trace_data_queue_tmp,TRUE);
-      g_queue_push_tail(event_viewer_data->raw_trace_data_queue_tmp,tmp_raw_trace_data);      
+      remove_item_from_queue(event_viewer_data->event_fields_queue_tmp,TRUE);
+      g_queue_push_tail(event_viewer_data->event_fields_queue_tmp,tmp_event_fields);      
     }
   }else{
-    g_queue_push_tail (event_viewer_data->raw_trace_data_queue_tmp,tmp_raw_trace_data);
+    g_queue_push_tail (event_viewer_data->event_fields_queue_tmp,tmp_event_fields);
   }
 
   g_string_free(detail_event, TRUE);
@@ -1800,19 +1952,19 @@ gboolean parse_event(void *hook_data, void *call_data)
 
 void remove_item_from_queue(GQueue * q, gboolean fromHead)
 {
-  RawTraceData *data1, *data2 = NULL;
+  EventFields *data1, *data2 = NULL;
   GList * list;
 
   if(fromHead){
-    data1 = (RawTraceData *)g_queue_pop_head(q);
+    data1 = (EventFields *)g_queue_pop_head(q);
     list  = g_list_first(q->head);
     if(list)
-      data2 = (RawTraceData *)(list->data);
+      data2 = (EventFields *)(list->data);
   }else{
-    data1 = (RawTraceData *)g_queue_pop_tail(q);
+    data1 = (EventFields *)g_queue_pop_tail(q);
     list  = g_list_last(q->head);
     if(list)
-      data2 = (RawTraceData *)(list->data);
+      data2 = (EventFields *)(list->data);
   }
 
   if(data2){
@@ -1829,8 +1981,8 @@ void remove_item_from_queue(GQueue * q, gboolean fromHead)
 
 void remove_all_items_from_queue(GQueue *q)
 {
-  RawTraceData *data;
-  while((data = (RawTraceData *)g_queue_pop_head(q)) != NULL){
+  EventFields *data;
+  while((data = (EventFields *)g_queue_pop_head(q)) != NULL){
     g_free(data);
   }  
 }
@@ -1844,12 +1996,11 @@ void remove_all_items_from_queue(GQueue *q)
  */
 static void init() {
 
-  /* Register the toolbar insert button */
-  toolbar_item_reg(hGuiEventsInsert_xpm, "Insert Event Viewer", h_gui_events);
-  
-  /* Register the menu item insert entry */
-  menu_item_reg("/", "Insert Event Viewer", h_gui_events);
-  
+  lttvwindow_register_constructor("/",
+                                  "Insert Event Viewer",
+                                  hGuiEventsInsert_xpm,
+                                  "Insert Event Viewer",
+                                  h_gui_events);
 }
 
 void event_destroy_walk(gpointer data, gpointer user_data)
@@ -1868,16 +2019,11 @@ static void destroy() {
   
   EventViewerData *event_viewer_data;
   
-  if(g_event_viewer_data_list){
-    g_slist_foreach(g_event_viewer_data_list, event_destroy_walk, NULL );
-    g_slist_free(g_event_viewer_data_list);
-  }
+  g_slist_foreach(g_event_viewer_data_list, event_destroy_walk, NULL );
+  g_slist_free(g_event_viewer_data_list);
 
-  /* Unregister the toolbar insert button */
-  toolbar_item_unreg(h_gui_events);
+  lttvwindow_unregister_constructor(h_gui_events);
   
-  /* Unregister the menu item insert entry */
-  menu_item_unreg(h_gui_events);
 }
 
 
This page took 0.048651 seconds and 4 git commands to generate.