accelerate double useage for time
[lttv.git] / ltt / branches / poly / lttv / modules / gui / detailedevents / events.c
index eb046529490667e8a9c66a40be55d650df7e6cde..f96d14a996bc5c36462b182ef96ab69564d0afe3 100644 (file)
@@ -31,7 +31,7 @@
  * 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
@@ -42,6 +42,7 @@
 #include <glib.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <string.h>
 
 #include <ltt/ltt.h>
 #include <ltt/event.h>
 
 #include "hGuiEventsInsert.xpm"
 
-#define MAX_NUMBER_EVENT "max_number_event"
+#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)
 
 
 /** 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;
@@ -70,13 +72,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,
@@ -89,22 +93,22 @@ typedef enum _ScrollDirection{
 typedef struct _EventViewerData {
 
   Tab * tab;
-  //TimeWindow   time_window;
-//  LttTime      current_time;
   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
-  gboolean     current_time_updated;
-  char *       filter_key;
+  
+  /* 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;
+  
+  gint     start_event_index;       // the first event shown in the window
+  gint     end_event_index;         // the last event shown in the window
+  gint     size;                    // maxi number of events loaded
 
   //scroll window containing Tree View
   GtkWidget * scroll_win;
@@ -116,28 +120,26 @@ 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 */
+  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;
   
-  guint num_visible_events;
-  guint first_event, last_event;
+  gint num_visible_events;
+  gint first_event, last_event;
   
-  /* TEST DATA, TO BE READ FROM THE TRACE */
   gint number_of_events ;
-  guint currently_selected_event  ;
+  gint 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 traceset_changed(void * hook_data, void * call_data);
@@ -149,15 +151,13 @@ void remove_context_hooks(EventViewerData * event_viewer_data,
         LttvTracesetContext * tsc);
 
 //! Event Viewer's constructor hook
-GtkWidget *h_gui_events(Tab *tab, LttvTracesetSelector * s, char* key);
+GtkWidget *h_gui_events(Tab *tab);
 //! Event Viewer's constructor
-EventViewerData *gui_events(Tab *tab, LttvTracesetSelector *s, char *key);
+EventViewerData *gui_events(Tab *tab);
 //! 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,
@@ -173,22 +173,17 @@ static void tree_v_size_allocate_cb (GtkWidget *widget, GtkAllocation *alloc, gp
 static void tree_v_size_request_cb (GtkWidget *widget, GtkRequisition *requisition, gpointer data);
 static void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data);
 static void tree_v_move_cursor_cb (GtkWidget *widget, GtkMovementStep arg1, gint arg2, gpointer data);
-static void 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);
-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;
+static gboolean parse_event(void *hook_data, void *call_data);
 
 /* Enumeration of the columns */
 enum
@@ -212,10 +207,9 @@ enum
  * @return The widget created.
  */
 GtkWidget *
-h_gui_events(Tab * tab, LttvTracesetSelector * s, char* key)
+h_gui_events(Tab * tab)
 {
-  EventViewerData* event_viewer_data = gui_events(tab, s, key) ;
-
+  EventViewerData* event_viewer_data = gui_events(tab) ;
   if(event_viewer_data)
     return event_viewer_data->hbox_v;
   else return NULL;
@@ -229,24 +223,21 @@ h_gui_events(Tab * tab, LttvTracesetSelector * s, char* key)
  * @return The Event viewer data created.
  */
 EventViewerData *
-gui_events(Tab *tab, LttvTracesetSelector * s,char* key )
+gui_events(Tab *tab)
 {
-  LttTime start;
+  LttTime end;
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   EventViewerData* event_viewer_data = g_new(EventViewerData,1) ;
-  RawTraceData * data;
 
   event_viewer_data->tab = tab;
   
   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();  
 
-  lttvwindow_register_time_window_notify(tab,
-                update_time_window, event_viewer_data);
   lttvwindow_register_current_time_notify(tab, 
                 update_current_time,event_viewer_data);
   //lttvwindow_register_show_notify(tab, 
@@ -261,8 +252,8 @@ gui_events(Tab *tab, LttvTracesetSelector * s,char* key )
       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 (
@@ -293,10 +284,6 @@ gui_events(Tab *tab, LttvTracesetSelector * s,char* key )
         G_CALLBACK (tree_v_move_cursor_cb),
         event_viewer_data);
 
-  g_signal_connect (G_OBJECT (event_viewer_data->tree_v), "grab-focus",
-        G_CALLBACK (tree_v_grab_focus),
-        event_viewer_data);
-    
   // Use on each column!
   //gtk_tree_view_column_set_sizing(event_viewer_data->tree_v, GTK_TREE_VIEW_COLUMN_FIXED);
   
@@ -425,10 +412,10 @@ gui_events(Tab *tab, LttvTracesetSelector * s,char* key )
   LttvTracesetContext * tsc =
         lttvwindow_get_traceset_context(event_viewer_data->tab);
   TimeInterval time_span = tsc->time_span;
-  start = ltt_time_sub(time_span.end_time, time_span.start_time);
+  end = ltt_time_sub(time_span.end_time, time_span.start_time);
 
   event_viewer_data->vadjust_c->upper =
-              ltt_time_to_double(start) * NANOSECONDS_PER_SECOND;
+              ltt_time_to_double(end);
 
   event_viewer_data->append = TRUE;
 
@@ -438,25 +425,9 @@ gui_events(Tab *tab, 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->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,
-        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",
@@ -488,9 +459,6 @@ void tree_v_set_cursor(EventViewerData *event_viewer_data)
   
   if(event_viewer_data->selected_event && event_viewer_data->first_event != -1)
     {
-      //      gtk_adjustment_set_value(event_viewer_data->vadjust_c,
-     //            event_viewer_data->currently_selected_event);
-      
       path = gtk_tree_path_new_from_indices(
               event_viewer_data->currently_selected_event-
               event_viewer_data->first_event,
@@ -693,8 +661,8 @@ void tree_v_cursor_changed_cb (GtkWidget *widget, gpointer data)
  
     if(ltt_time.tv_sec != current_time.tv_sec ||
        ltt_time.tv_nsec != current_time.tv_nsec){
-      event_viewer_data->current_time_updated = TRUE;
-      lttvwindow_report_current_time(tab,&ltt_time);
+   //   event_viewer_data->current_time_updated = TRUE;
+      lttvwindow_report_current_time(tab,ltt_time);
     }
   }else{
     g_warning("Can not get iter\n");
@@ -708,7 +676,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);
   
   
@@ -730,16 +698,12 @@ void v_scroll_cb (GtkAdjustment *adjustment, gpointer data)
       //             NULL, FALSE);
       gtk_tree_path_free(tree_path);
     }
-  
 }
 
-gint get_cell_height(GtkTreeView *TreeView)
+static __inline gint get_cell_height(GtkTreeView *TreeView)
 {
-  gint height, width;
+  gint height;
   GtkTreeViewColumn *column = gtk_tree_view_get_column(TreeView, 0);
-  GList *Render_List = gtk_tree_view_column_get_cell_renderers(column);
-  GtkCellRenderer *renderer = g_list_first(Render_List)->data;
   
   gtk_tree_view_column_cell_get_size(column, NULL, NULL, NULL, NULL, &height);
   
@@ -765,10 +729,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 : %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)
     {
-      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);
     }
@@ -793,8 +761,8 @@ gboolean show_event_detail(void * hook_data, void * call_data)
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   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;
   }
@@ -802,9 +770,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);
 
@@ -820,14 +788,14 @@ void insert_data_into_model(EventViewerData *event_viewer_data, int start, int e
 {
   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;
@@ -845,75 +813,76 @@ void insert_data_into_model(EventViewerData *event_viewer_data, int start, int e
   }
 }
 
-static void get_test_data_wrapped(double time_value, guint list_height, 
+static void get_data_wrapped(double time_value, gint list_height, 
        EventViewerData *event_viewer_data, LttEvent *ev);
-void get_test_data(double time_value, guint list_height,
+
+static void get_data(double time_value, guint list_height,
      EventViewerData *event_viewer_data)
 {
   LttEvent * ev = ltt_event_new();
 
-  get_test_data_wrapped(time_value, list_height,
+  get_data_wrapped(time_value, list_height,
       event_viewer_data, ev);
 
   ltt_event_destroy(ev);
 }
 
-static void get_test_data_wrapped(double time_value, guint list_height, 
+static void get_data_wrapped(double time_value, gint 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;
+  gint event_number = event_viewer_data->start_event_index;
   double value = event_viewer_data->previous_value - time_value;
   LttTime start, end, time;
-  unsigned backward_num, minNum, maxNum;
+  gint backward_num, minNum, maxNum;
   LttTracefile * tf;
-  unsigned  block_num, event_num;
-  unsigned size = 1, count = 0;
+  unsigned  block_num;
+  gint size = 1, count = 0;
   gboolean need_backward_again, backward;
-  GdkWindow * win;
-  //GdkCursor * new;
-  GtkWidget* widget = gtk_widget_get_parent(event_viewer_data->hbox_v);
   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 ||
   //     event_number + list_height-1 < event_viewer_data->first_event ||
   //     event_viewer_data->first_event == -1)
   {
     /* no event can be reused, clear and start from nothing */
-    if(value == -1.0)      direction = SCROLL_STEP_DOWN;
-    else if(value == 1.0 ) direction = SCROLL_STEP_UP;
-    else if(value == -2.0) direction = SCROLL_PAGE_DOWN;
-    else if(value == 2.0 ) direction = SCROLL_PAGE_UP;
-    else if(value == 0.0 ) direction = SCROLL_NONE;
-    else direction = SCROLL_JUMP;
+    if(value < 0.0) {
+      if(value >= -1.0)      direction = SCROLL_STEP_DOWN;
+      else if(value >= -2.0) direction = SCROLL_PAGE_DOWN;
+      else direction = SCROLL_JUMP;
+    } else if(value > 0.0) {
+      if(value <= 1.0) direction = SCROLL_STEP_UP;
+      else if(value <= 2.0) direction = SCROLL_PAGE_UP;
+      else direction = SCROLL_JUMP;
+    } 
+    else direction = SCROLL_NONE; /* 0.0 */
+
+    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){
@@ -921,56 +890,21 @@ static void get_test_data_wrapped(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;
-      if(end.tv_nsec != 0)
-        end.tv_nsec--;
-      else
-        end.tv_sec--;   // even if tv_sec == 0, wrapping should give a real big
-                        // value, so will read all the trace.
-      ltt_event_position_get(raw_data->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);
-    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);
-      g_assert(ltt_tracefile_read(tf,ev) != NULL);
-      start = ltt_event_time(ev);             
-    }else{
-      start.tv_sec  = 0;
-      start.tv_nsec = 0;    
-    }
-    maxNum = RESERVE_SMALL_SIZE_CUBE;
-        }
-      }else{
-        if(block_num > count){
-    ltt_event_position_set(raw_data->ep, block_num-count, 1);
-    ltt_tracefile_seek_position(tf, raw_data->ep);
-    g_assert(ltt_tracefile_read(tf, ev) != NULL);
-    start = ltt_event_time(ev);             
-        }else{
-    start.tv_sec  = 0;
-    start.tv_nsec = 0;    
-        }       
-        maxNum = RESERVE_SMALL_SIZE_CUBE;
-      }
+      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);
 
       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){
@@ -986,12 +920,13 @@ static void get_test_data_wrapped(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;
@@ -1006,15 +941,16 @@ static void get_test_data_wrapped(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;
@@ -1032,28 +968,37 @@ static void get_test_data_wrapped(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);
+  time = ltt_time_from_double(time_value);
   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;
+    }
+      
+    gint event_num;
+    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);
+      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;
@@ -1061,7 +1006,7 @@ static void get_test_data_wrapped(double time_value, guint list_height,
       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)
@@ -1072,6 +1017,7 @@ static void get_test_data_wrapped(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:
@@ -1082,14 +1028,18 @@ static void get_test_data_wrapped(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, 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");
+  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);
+  //gtk_adjustment_set_value(event_viewer_data->vadjust_c, 
+  //                         ltt_time_to_double(time));
+  //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);
       }
     }
     
@@ -1100,7 +1050,7 @@ static void get_test_data_wrapped(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;
@@ -1111,71 +1061,12 @@ static void get_test_data_wrapped(double time_value, guint list_height,
 
     insert_data_into_model(event_viewer_data,event_number, event_number+list_height);
   }
-#ifdef DEBUG //do not use this, it's slower and broken
-  //  } else {
-  /* Some events will be reused */
-  if(event_number < event_viewer_data->first_event)
-    {
-      /* scrolling up, prepend events */
-      tree_path = gtk_tree_path_new_from_indices
-  (event_number+list_height-1 -
-   event_viewer_data->first_event + 1,
-   -1);
-      for(i=0; i<event_viewer_data->last_event-(event_number+list_height-1);
-    i++)
-  {
-    /* Remove the last events from the list */
-    if(gtk_tree_model_get_iter(model, &iter, tree_path))
-      gtk_list_store_remove(event_viewer_data->store_m, &iter);
-  }
-      
-      for(i=event_viewer_data->first_event-1; i>=event_number; i--)
-  {
-    if(i>=event_viewer_data->number_of_events) break;
-    /* Prepend new events */
-    gtk_list_store_prepend (event_viewer_data->store_m, &iter);
-    gtk_list_store_set (event_viewer_data->store_m, &iter,
-            CPUID_COLUMN, 0,
-            EVENT_COLUMN, "event irq",
-            TIME_COLUMN, i,
-            PID_COLUMN, 100,
-            ENTRY_LEN_COLUMN, 17,
-            EVENT_DESCR_COLUMN, "Detailed information",
-            -1);
-  }
-    } else {
-      /* Scrolling down, append events */
-      for(i=event_viewer_data->first_event; i<event_number; i++)
-  {
-    /* Remove these events from the list */
-    gtk_tree_model_get_iter_first(model, &iter);
-    gtk_list_store_remove(event_viewer_data->store_m, &iter);
-  }
-      for(i=event_viewer_data->last_event+1; i<event_number+list_height; i++)
-  {
-    if(i>=event_viewer_data->number_of_events) break;
-    /* Append new events */
-    gtk_list_store_append (event_viewer_data->store_m, &iter);
-    gtk_list_store_set (event_viewer_data->store_m, &iter,
-            CPUID_COLUMN, 0,
-            EVENT_COLUMN, "event irq",
-            TIME_COLUMN, i,
-            PID_COLUMN, 100,
-            ENTRY_LEN_COLUMN, 17,
-            EVENT_DESCR_COLUMN, "Detailed information",
-            -1);
-  }
-      
-    }
-  //}
-#endif //DEBUG
+
   event_viewer_data->first_event = event_viewer_data->start_event_index ;
   event_viewer_data->last_event = event_viewer_data->end_event_index ;
 
  LAST:
   return;
- // if(widget)
- //    gdk_window_set_cursor(win, NULL);  
 
 }
 
@@ -1209,12 +1100,10 @@ gui_events_free(EventViewerData *event_viewer_data)
     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);
 
-    lttvwindow_unregister_time_window_notify(tab,
-                        update_time_window, event_viewer_data);
     lttvwindow_unregister_current_time_notify(tab,
                         update_current_time, event_viewer_data);
     //lttvwindow_unregister_show_notify(tab,
@@ -1222,7 +1111,6 @@ gui_events_free(EventViewerData *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);
   }
@@ -1231,26 +1119,13 @@ gui_events_free(EventViewerData *event_viewer_data)
 void
 gui_events_destructor(EventViewerData *event_viewer_data)
 {
-  guint index;
 
   /* May already been done by GTK window closing */
   if(GTK_IS_WIDGET(event_viewer_data->hbox_v)){
-    gui_events_free(event_viewer_data);
     gtk_widget_destroy(event_viewer_data->hbox_v);
-    event_viewer_data = NULL;
   }
-  
-  /* Destroy the Tree View */
-  //gtk_widget_destroy(event_viewer_data->tree_v);
-  
-  /*  Clear raw event list */
-  //gtk_list_store_clear(event_viewer_data->store_m);
-  //gtk_widget_destroy(GTK_WIDGET(event_viewer_data->store_m));
-  
-  //gui_events_free(event_viewer_data);
 }
 
-//FIXME : call hGuiEvents_Destructor for corresponding data upon widget destroy
 
 static void
 tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data)
@@ -1269,18 +1144,7 @@ tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data)
 }
 
 
-int event_selected_hook(void *hook_data, void *call_data)
-{
-  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
-  guint *event_number = (guint*) call_data;
-  
-  event_viewer_data->currently_selected_event = *event_number;
-  event_viewer_data->selected_event = TRUE ;
-  
-  tree_v_set_cursor(event_viewer_data);
-
-}
-
+#if 0
 /* If every module uses the filter, maybe these two 
  * (add/remove_context_hooks functions) should be put in common place
  */
@@ -1292,16 +1156,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
   
@@ -1419,110 +1276,110 @@ void remove_context_hooks(EventViewerData * event_viewer_data,
   //    lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL,
   //           NULL, NULL, NULL,event_viewer_data->event_hooks,NULL);
 }
-
-
-gboolean update_time_window(void * hook_data, void * call_data)
-{
-  EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
-  const TimeWindowNotifyData *time_window_notify_data;
-  LttvTracesetContext * tsc = lttvwindow_get_traceset_context(event_viewer_data->tab);
-
-  if(event_viewer_data->shown == FALSE){
-    //event_viewer_data->time_window = *(TimeWindow*)call_data;
-    
-    //add_context_hooks(event_viewer_data, tsc);
-  }
-
-  return FALSE;
-}
+#endif //0
 
 gboolean update_current_time(void * hook_data, void * call_data)
 {
   EventViewerData *event_viewer_data = (EventViewerData*) hook_data;
   const LttTime * current_time = (LttTime*)call_data;
-  guint64 nsec = current_time->tv_sec * NANOSECONDS_PER_SECOND 
-                  + current_time->tv_nsec;
+  guint64 nsec = (guint64)current_time->tv_sec * NANOSECONDS_PER_SECOND 
+                  + (guint64)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;
+  guint i;
+  gint  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 0
   if(event_viewer_data->current_time_updated ){
     event_viewer_data->current_time_updated = FALSE;
     return FALSE;
   }
-
+#endif //0
   //check if the event is shown in the current viewer
+  gint count = 0;
+  gboolean event_shown = FALSE;
   if(gtk_tree_model_get_iter_first(model, &iter)){
-    while(1){
-      gtk_tree_model_get(model, &iter, TIME_COLUMN, &time, -1);
-      if(time < nsec){
-  if(!gtk_tree_model_iter_next(model, &iter)){
-    count = -1;
-    break;
-  }
-  count++;
-      }else{
-  break;
+    gtk_tree_model_get(model, &iter, TIME_COLUMN, &time, -1);
+    if(time > nsec){
+      /* Event is before the list */
+    } else {
+      /* Event can be in the list */
+      if(time >= nsec){
+        /* found */
+        event_shown = TRUE;
+      } else {
+        while(gtk_tree_model_iter_next(model, &iter)) {
+          gtk_tree_model_get(model, &iter, TIME_COLUMN, &time, -1);
+          count++;
+          if(time >= nsec){
+            /* found */
+            event_shown = TRUE;
+            break;
+          }
+        }
       }
     }
-    //    event_selected_hook(event_viewer_data, &count);
   }
 
-  //the event is not shown in the current viewer
-  if(count == -1){
+  if(!event_shown)
+  {
+    //the event is not shown in the current viewer
     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, *current_time)<=0 &&
        ltt_time_compare(data1->time, *current_time)>=0){
-      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(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((gint)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, 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");
+      event_viewer_data->vadjust_c->value = ltt_time_to_double(t);
+      //gtk_adjustment_set_value(event_viewer_data->vadjust_c, 
+      //                         ltt_time_to_double(t));
+      //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(*current_time, time_span.start_time);
-      double position = ltt_time_to_double(start) * NANOSECONDS_PER_SECOND;
+      double position = ltt_time_to_double(start);
       gtk_adjustment_set_value(event_viewer_data->vadjust_c, position);
     }
   }
 
-  sprintf(str_path,"%d\0",count);
+  sprintf(str_path,"%d",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;
@@ -1535,29 +1392,23 @@ gboolean traceset_changed(void * hook_data, void * call_data)
         lttvwindow_get_traceset_context(event_viewer_data->tab);
   TimeInterval time_span = tsc->time_span;
   
-  LttTime start;
-  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;
 
-  start = ltt_time_sub(time_span.end_time, time_span.start_time);
-  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);
+  g_signal_emit_by_name(event_viewer_data->vadjust_c, "value-changed");
   //  event_viewer_data->vadjust_c->value = 0;
 
   return FALSE;
 }
 
 
-void tree_v_grab_focus(GtkWidget *widget, gpointer data){
-  EventViewerData *event_viewer_data = (EventViewerData *)data;
-  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;
@@ -1567,18 +1418,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=(gint)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);     
@@ -1593,8 +1444,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<(gint)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);     
@@ -1609,8 +1460,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<(gint)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);     
@@ -1625,8 +1476,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=(gint)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);     
@@ -1642,7 +1493,8 @@ void update_raw_data_array(EventViewerData* event_viewer_data, unsigned size)
   }
       }
       
-      len = pid_array->len > tmp_pid_array->len ? tmp_pid_array->len : pid_array->len;
+      len = (pid_array->len > tmp_pid_array->len) ? 
+                                    tmp_pid_array->len : pid_array->len;
       for(j=0;j<len;j++){
   pid = g_array_index(pid_array,int, j);
   tmpPid = g_array_index(tmp_pid_array,int,j);
@@ -1650,14 +1502,14 @@ 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);
-      if(data->pid == -1 && data->cpu_id == j) data->pid = tmpPid;
+    for(i=0;i<(gint)event_viewer_data->event_fields_queue->length;i++){
+      data = (EventFields*)g_list_nth_data(list,i);
+      if(data->pid == -1 && (gint)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);
-      if(data->pid == -1 && data->cpu_id == j) data->pid = pid;
+    for(i=0;i<(gint)event_viewer_data->event_fields_queue_tmp->length;i++){
+      data = (EventFields*)g_list_nth_data(tmpList,i);
+      if(data->pid == -1 && (gint)data->cpu_id == j) data->pid = pid;
     }
   }
       }
@@ -1667,19 +1519,20 @@ 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);
       }
     }
   }
@@ -1701,9 +1554,26 @@ void get_events(EventViewerData* event_viewer_data, LttTime start,
                               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));
 
-  lttv_process_traceset_middle(tsc, ltt_time_infinite, max_num_events, NULL);
-
+  }
+  
   //remove_context_hooks(event_viewer_data,tsc);
   lttv_process_traceset_end(tsc,
                             NULL,
@@ -1713,7 +1583,7 @@ void get_events(EventViewerData* event_viewer_data, LttTime start,
                             NULL);
   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);
@@ -1743,6 +1613,8 @@ void get_events(EventViewerData* event_viewer_data, LttTime start,
   events_request->end_time = ltt_time_infinite;
   events_request->num_events = max_num_events;
   events_request->end_position = NULL;
+  events_request->trace = -1;  /* FIXME */
+  events_request->hooks = NULL;  /* FIXME */
   events_request->before_chunk_traceset = NULL;
   events_request->before_chunk_trace = NULL;
   events_request->before_chunk_tracefile = NULL;
@@ -1763,12 +1635,12 @@ void get_events(EventViewerData* event_viewer_data, LttTime start,
 #endif //0
 }
 #if 0
-int after_get_events(void *hook_data, void *call_data)
+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);
@@ -1812,7 +1684,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;
@@ -1822,12 +1694,25 @@ 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, " }");
+      break;
+
+    case LTT_UNION:
+      g_string_append_printf(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);        
         get_event_detail(e, element, s);
       }
       g_string_append_printf(s, " }");
       break;
+
   }
   
 }
@@ -1858,7 +1743,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;
@@ -1871,66 +1756,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<(gint)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);
@@ -1940,19 +1825,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){
@@ -1969,8 +1854,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);
   }  
 }
@@ -1984,7 +1869,8 @@ void remove_all_items_from_queue(GQueue *q)
  */
 static void init() {
 
-  lttvwindow_register_constructor("/",
+  lttvwindow_register_constructor("guievents",
+                                  "/",
                                   "Insert Event Viewer",
                                   hGuiEventsInsert_xpm,
                                   "Insert Event Viewer",
@@ -2003,9 +1889,6 @@ void event_destroy_walk(gpointer data, gpointer user_data)
  * everything that has been registered in the gtkTraceSet API.
  */
 static void destroy() {
-  int i;
-  
-  EventViewerData *event_viewer_data;
   
   g_slist_foreach(g_event_viewer_data_list, event_destroy_walk, NULL );
   g_slist_free(g_event_viewer_data_list);
This page took 0.043114 seconds and 4 git commands to generate.