X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fdetailedevents%2Fevents.c;h=b3c8d5d85af4849db1100266ba4da9bd0a1509b6;hb=c6832b57f110e6e79501847998821d684ac3ea8b;hp=40d184681eb7ce8a776fd9a1be6d18ea26e1c939;hpb=54d8f654b0f1e1301f4e8a2bdc600bc370fff6f9;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 40d18468..b3c8d5d8 100644
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -415,7 +415,7 @@ gui_events(Tab *tab)
   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;
+              ltt_time_to_double(end);
 
   event_viewer_data->append = TRUE;
 
@@ -928,8 +928,7 @@ static void get_data_wrapped(double time_value, gint list_height,
     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;
+    end = ltt_time_infinite;
     get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE, &size);
     if(size == 0){
       get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_SQUARE,&size);
@@ -952,8 +951,7 @@ static void get_data_wrapped(double time_value, gint list_height,
     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;
+    end = ltt_time_infinite;
     get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE,&size);
     if(size == 0){
       get_events(event_viewer_data, start, end, RESERVE_SMALL_SIZE_SQUARE,&size);
@@ -971,9 +969,8 @@ static void get_data_wrapped(double time_value, gint list_height,
         g_debug("direction SCROLL_JUMP");
   event_viewer_data->append = TRUE;
   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);
+  end = ltt_time_infinite;
+  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);
@@ -1034,9 +1031,9 @@ static void get_data_wrapped(double time_value, gint list_height,
   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;
+  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) * NANOSECONDS_PER_SECOND);
+  //                         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);
@@ -1339,7 +1336,7 @@ gboolean update_current_time(void * hook_data, void * call_data)
     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);
-
+#if 0
     //the event is in the buffer
     if(ltt_time_compare(data->time, *current_time)<=0 &&
        ltt_time_compare(data1->time, *current_time)>=0){
@@ -1361,19 +1358,20 @@ gboolean update_current_time(void * hook_data, void * call_data)
   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;
+      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) * NANOSECONDS_PER_SECOND);
+      //                         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); 
       //gtk_adjustment_value_changed(event_viewer_data->vadjust_c);
 
     }else{//the event is not in the buffer
+#endif //0
       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",count);
@@ -1398,7 +1396,7 @@ gboolean traceset_changed(void * hook_data, void * call_data)
   event_viewer_data->append = TRUE;
 
   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->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;
 
@@ -1613,7 +1611,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 = 0;  /* FIXME */
+  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;