precomputed states almost ok, needs testing

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

diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
index 84af45a060e2b0ee98d7da31b7faf2abd73f1680..dcd2cf998460c1cedefbfef453782ba9d3e8b302 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
+++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c
@@ -77,10 +77,8 @@
 
 #define abs(a) (((a)<0)?(-a):(a))
 #define max(a,b) ((a)>(b)?(a):(b))
+#define min(a,b) ((a)<(b)?(a):(b))
 
-/* Number of events between checks for GDK events (stop button) */
-#define CHECK_GDK_INTERVAL 50000
-                               
 /** Array containing instanced objects. Used when module is unloaded */
 static GSList *g_event_viewer_data_list = NULL ;
 
@@ -558,6 +556,7 @@ static void request_background_data(EventViewerData *event_viewer_data)
   gint num_traces = lttv_traceset_number(tsc->ts);
   gint i;
   LttvTrace *trace;
+  LttvTraceState *tstate;
 
   LttvHooks *background_ready_hook = 
     lttv_hooks_new();
@@ -567,8 +566,10 @@ static void request_background_data(EventViewerData *event_viewer_data)
   
   for(i=0;i<num_traces;i++) {
     trace = lttv_traceset_get(tsc->ts, i);
+    tstate = LTTV_TRACE_STATE(tsc->traces[i]);
 
-    if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) {
+    if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE
+        && !tstate->has_precomputed_states) {
 
       if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"),
                                           trace) == FALSE) {
@@ -595,7 +596,7 @@ static void request_background_data(EventViewerData *event_viewer_data)
         event_viewer_data->background_info_waiting++;
       }
     } else {
-      /* Data ready. Be its nature, this viewer doesn't need to have
+      /* Data ready. By its nature, this viewer doesn't need to have
        * its data ready hook called htere, because a background
        * request is always linked with a redraw.
        */
@@ -1274,11 +1275,16 @@ gboolean show_event_detail(void * hook_data, void * call_data)
 }
 #endif //0
 
-
-
-
-
-
+static gboolean events_check_handler(guint count, gboolean *stop_flag)
+{
+  if(count % CHECK_GDK_INTERVAL == 0) {
+    gtk_main_iteration_do(FALSE);
+    if(*stop_flag)
+      return TRUE;
+    else
+      return FALSE;
+  } else return FALSE;
+}
 
 static void get_events(double new_value, EventViewerData *event_viewer_data)
 {
@@ -1289,10 +1295,13 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
   guint i;
   gboolean seek_by_time;
   
+  if(lttvwindow_preempt_count > 0) return;
+
   double value = new_value - event_viewer_data->previous_value;
 
   /* Set stop button status for foreground processing */
   event_viewer_data->tab->stop_foreground = FALSE;
+  lttvwindow_events_request_disable();
   
   /* See where we have to scroll... */
   ScrollDirection direction;
@@ -1392,8 +1401,9 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
    */
     if(relative_position > 0) {
       guint count;
-      count = lttv_process_traceset_seek_n_forward(tsc, relative_position,
-          event_viewer_data->main_win_filter);
+      count += lttv_process_traceset_seek_n_forward(tsc, relative_position,
+          event_viewer_data->main_win_filter, events_check_handler,
+          &event_viewer_data->tab->stop_foreground);
     } else if(relative_position < 0) {
       guint count;
       
@@ -1405,10 +1415,14 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
       LttTime time_diff = ltt_time_sub(last_event_time, first_event_time);
       if(ltt_time_compare(time_diff, ltt_time_zero) == 0)
         time_diff = seek_back_default_offset;
-      count = lttv_process_traceset_seek_n_backward(tsc, abs(relative_position),
+
+      count = lttv_process_traceset_seek_n_backward(tsc,
+          abs(relative_position),
           time_diff,
           (seek_time_fct)lttv_state_traceset_seek_time_closest,
-          event_viewer_data->main_win_filter);
+          event_viewer_data->main_win_filter,
+         events_check_handler,
+         &event_viewer_data->tab->stop_foreground);
     } /* else 0 : do nothing : we are already at the beginning position */
 
     lttv_traceset_context_position_destroy(pos);
@@ -1489,6 +1503,8 @@ static void get_events(double new_value, EventViewerData *event_viewer_data)
     gdk_x11_get_server_time(
         gtk_widget_get_parent_window(event_viewer_data->tree_v));
 
+  lttvwindow_events_request_enable();
+
   return;
 }
 
@@ -1501,13 +1517,12 @@ int event_hook(void *hook_data, void *call_data)
   LttvTracefileState *tfs = (LttvTracefileState*)call_data;
   LttEvent *e = ltt_tracefile_get_event(tfc->tf);
 
-  event_viewer_data->num_events++;
   if(event_viewer_data->num_events % CHECK_GDK_INTERVAL == 0) {
-    while(gtk_events_pending ())
-      gtk_main_iteration();
+    gtk_main_iteration_do(FALSE);
     if(event_viewer_data->tab->stop_foreground)
       return TRUE;
   }
+  event_viewer_data->num_events++;
   
   LttvFilter *filter = event_viewer_data->main_win_filter;
   if(filter != NULL && filter->head != NULL)