enhancements and bugfixes
[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / eventhooks.c
index 75609d09544dd8599ed0701c8dbf2fb83d591ac4..98b13d278cdecfeaac0e1099a472162afa43a254 100644 (file)
@@ -40,6 +40,7 @@
 #include <lttv/hook.h>
 #include <lttv/state.h>
 #include <lttvwindow/lttvwindow.h>
+#include <lttvwindow/lttvwindowtraces.h>
 
 
 #include "eventhooks.h"
 #define MAX_PATH_LEN 256
 
 
+/* Action to do when background computation completed.
+ *
+ * Eventually, will have to check that every requested traces are finished
+ * before doing the redraw.
+ */
+
+gint background_ready(void *hook_data, void *call_data)
+{
+  ControlFlowData *control_flow_data = (ControlFlowData *)hook_data;
+  LttvTrace *trace = (LttvTrace*)call_data;
+
+  g_debug("control flow viewer : background computation data ready.");
+
+  redraw_notify(control_flow_data, NULL);
+
+  return 0;
+}
+
+
+/* Request background computation. Verify if it is in progress or ready first.
+ *
+ * Right now, for all loaded traces.
+ *
+ * Later : must be only for each trace in the tab's traceset.
+ */
+void request_background_data(ControlFlowData *control_flow_data)
+{
+  gint num_traces = lttvwindowtraces_get_number();
+  gint i;
+  LttvTrace *trace;
+
+  LttvHooks *background_ready_hook = 
+    lttv_hooks_new();
+  lttv_hooks_add(background_ready_hook, background_ready, control_flow_data,
+      LTTV_PRIO_DEFAULT);
+  
+  for(i=0;i<num_traces;i++) {
+    trace = lttvwindowtraces_get_trace(i);
+
+    if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) {
+
+      if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"),
+                                          trace) == FALSE) {
+        /* We first remove requests that could have been done for the same
+         * information. Happens when two viewers ask for it before servicing
+         * starts.
+         */
+        lttvwindowtraces_background_request_remove(trace, "state");
+        lttvwindowtraces_background_request_queue(trace,
+                                                  "state");
+        lttvwindowtraces_background_notify_queue(control_flow_data,
+                                                 trace,
+                                                 ltt_time_infinite,
+                                                 NULL,
+                                                 background_ready_hook);
+      } else { /* in progress */
+      
+        lttvwindowtraces_background_notify_current(control_flow_data,
+                                                   trace,
+                                                   ltt_time_infinite,
+                                                   NULL,
+                                                   background_ready_hook);
+      
+      }
+    }
+  }
+
+  lttv_hooks_destroy(background_ready_hook);
+}
+
+
+
+
 /**
  * Event Viewer's constructor hook
  *
@@ -70,6 +144,10 @@ h_guicontrolflow(Tab *tab, LttvTracesetSelector * s, char * key)
   
   //g_debug("time width2 : %u",time_window->time_width);
   // Unreg done in the GuiControlFlow_Destructor
+  lttvwindow_register_traceset_notify(tab,
+        traceset_notify,
+        control_flow_data);
+    
   lttvwindow_register_time_window_notify(tab,
                                          update_time_window_hook,
                                          control_flow_data);
@@ -82,7 +160,8 @@ h_guicontrolflow(Tab *tab, LttvTracesetSelector * s, char * key)
   lttvwindow_register_continue_notify(tab,
                                       continue_notify,
                                       control_flow_data);
-
+  request_background_data(control_flow_data);
+  
 
   return guicontrolflow_get_widget(control_flow_data) ;
   
@@ -191,7 +270,7 @@ int draw_event_hook(void *hook_data, void *call_data)
     g_debug("out : %s",g_quark_to_string(process_out->state->s));
     
     birth = process_out->creation_time;
-    gchar *name = strdup(g_quark_to_string(process_out->name));
+    const gchar *name = g_quark_to_string(process_out->name);
     HashedProcessData *hashed_process_data_out = NULL;
 
     if(processlist_get_process_pixels(process_list,
@@ -202,25 +281,24 @@ int draw_event_hook(void *hook_data, void *call_data)
             &height,
             &hashed_process_data_out) == 1)
     {
-    /* Process not present */
-    processlist_add(process_list,
-        pid_out,
-        &birth,
-        tfc->t_context->index,
-        name,
-        &pl_height,
-        &hashed_process_data_out);
-    processlist_get_process_pixels(process_list,
-            pid_out,
-            &birth,
-            tfc->t_context->index,
-            &y_out,
-            &height,
-            &hashed_process_data_out);
-    drawing_insert_square( control_flow_data->drawing, y_out, height);
+      /* Process not present */
+      processlist_add(process_list,
+          pid_out,
+          &birth,
+          tfc->t_context->index,
+          name,
+          &pl_height,
+          &hashed_process_data_out);
+      g_assert(processlist_get_process_pixels(process_list,
+              pid_out,
+              &birth,
+              tfc->t_context->index,
+              &y_out,
+              &height,
+              &hashed_process_data_out)==0);
+      drawing_insert_square( control_flow_data->drawing, y_out, height);
     }
-
-    g_free(name);
+    //g_free(name);
     
     /* Find process pid_in in the list... */
     process_in = lttv_state_find_process(tfs, pid_in);
@@ -228,7 +306,7 @@ int draw_event_hook(void *hook_data, void *call_data)
     g_debug("in : %s",g_quark_to_string(process_in->state->s));
 
     birth = process_in->creation_time;
-    name = strdup(g_quark_to_string(process_in->name));
+    name = g_quark_to_string(process_in->name);
     HashedProcessData *hashed_process_data_in = NULL;
 
     if(processlist_get_process_pixels(process_list,
@@ -239,7 +317,7 @@ int draw_event_hook(void *hook_data, void *call_data)
             &height,
             &hashed_process_data_in) == 1)
     {
-    /* Process not present */
+      /* Process not present */
       processlist_add(process_list,
         pid_in,
         &birth,
@@ -257,13 +335,13 @@ int draw_event_hook(void *hook_data, void *call_data)
 
       drawing_insert_square( control_flow_data->drawing, y_in, height);
     }
-    g_free(name);
+    //g_free(name);
 
 
     /* Find pixels corresponding to time of the event. If the time does
      * not fit in the window, show a warning, not supposed to happend. */
     guint x = 0;
-    guint width = control_flow_data->drawing->drawing_area->allocation.width;
+    guint width = control_flow_data->drawing->width;
 
     LttTime time = ltt_event_time(e);
 
@@ -278,7 +356,7 @@ int draw_event_hook(void *hook_data, void *call_data)
         width,
         &x);
     //assert(x <= width);
-    
+    //
     /* draw what represents the event for outgoing process. */
 
     DrawContext *draw_context_out = hashed_process_data_out->draw_context;
@@ -325,8 +403,9 @@ int draw_event_hook(void *hook_data, void *call_data)
 
     if(process_out->state->s == LTTV_STATE_RUN)
     {
-      draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
-      gdk_gc_copy(draw_context_out->gc, widget->style->black_gc);
+      //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
+      //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc);
+      draw_context_out->gc = control_flow_data->drawing->gc;
 
       PropertiesBG prop_bg;
       prop_bg.color = g_new(GdkColor,1);
@@ -361,7 +440,7 @@ int draw_event_hook(void *hook_data, void *call_data)
       g_debug("calling from draw_event");
       draw_bg((void*)&prop_bg, (void*)draw_context_out);
       g_free(prop_bg.color);
-      gdk_gc_unref(draw_context_out->gc);
+      //gdk_gc_unref(draw_context_out->gc);
     }
 
     draw_context_out->gc = widget->style->black_gc;
@@ -438,8 +517,9 @@ int draw_event_hook(void *hook_data, void *call_data)
     draw_text((void*)&prop_text_out, (void*)draw_context_out);
     //gdk_gc_unref(draw_context_out->gc);
 
-    draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
-    gdk_gc_copy(draw_context_out->gc, widget->style->black_gc);
+    //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
+    //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc);
+    draw_context_out->gc = control_flow_data->drawing->gc;
 
     PropertiesLine prop_line_out;
     prop_line_out.color = g_new(GdkColor,1);
@@ -495,7 +575,7 @@ int draw_event_hook(void *hook_data, void *call_data)
   
     draw_line((void*)&prop_line_out, (void*)draw_context_out);
     g_free(prop_line_out.color);
-    gdk_gc_unref(draw_context_out->gc);
+    //gdk_gc_unref(draw_context_out->gc);
     /* Note : finishing line will have to be added when trace read over. */
       
     /* Finally, update the drawing context of the pid_in. */
@@ -546,8 +626,9 @@ int draw_event_hook(void *hook_data, void *call_data)
 
     if(process_in->state->s == LTTV_STATE_RUN)
     {
-      draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
-      gdk_gc_copy(draw_context_in->gc, widget->style->black_gc);
+      //draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
+      //gdk_gc_copy(draw_context_in->gc, widget->style->black_gc);
+      draw_context_in->gc = control_flow_data->drawing->gc;
 
       PropertiesBG prop_bg;
       prop_bg.color = g_new(GdkColor,1);
@@ -582,7 +663,7 @@ int draw_event_hook(void *hook_data, void *call_data)
 
       draw_bg((void*)&prop_bg, (void*)draw_context_in);
       g_free(prop_bg.color);
-      gdk_gc_unref(draw_context_in->gc);
+      //gdk_gc_unref(draw_context_in->gc);
     }
 
     draw_context_in->gc = widget->style->black_gc;
@@ -661,8 +742,9 @@ int draw_event_hook(void *hook_data, void *call_data)
     draw_text((void*)&prop_text_in, (void*)draw_context_in);
     //gdk_gc_unref(draw_context_in->gc);
    
-    draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
-    gdk_gc_copy(draw_context_in->gc, widget->style->black_gc);
+    //draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
+    //gdk_gc_copy(draw_context_in->gc, widget->style->black_gc);
+    draw_context_in->gc = control_flow_data->drawing->gc;
 
     PropertiesLine prop_line_in;
     prop_line_in.color = g_new(GdkColor,1);
@@ -716,12 +798,12 @@ int draw_event_hook(void *hook_data, void *call_data)
   
     draw_line((void*)&prop_line_in, (void*)draw_context_in);
     g_free(prop_line_in.color);
-    gdk_gc_unref(draw_context_in->gc);
+    //gdk_gc_unref(draw_context_in->gc);
   }
 
   return 0;
 
-  /* Temp dump */
+  /* Text dump */
 #ifdef DONTSHOW
   GString *string = g_string_new("");;
   gboolean field_names = TRUE, state = TRUE;
@@ -811,22 +893,22 @@ int draw_after_hook(void *hook_data, void *call_data)
             &height,
             &hashed_process_data_out) == 1)
     {
-    /* Process not present */
-    processlist_add(process_list,
-        pid_out,
-        &birth,
-        tfc->t_context->index,
-        name,
-        &pl_height,
-        &hashed_process_data_out);
-    processlist_get_process_pixels(process_list,
-            pid_out,
-            &birth,
-            tfc->t_context->index,
-            &y_out,
-            &height,
-            &hashed_process_data_out);
-    drawing_insert_square( control_flow_data->drawing, y_out, height);
+      /* Process not present */
+      processlist_add(process_list,
+          pid_out,
+          &birth,
+          tfc->t_context->index,
+          name,
+          &pl_height,
+          &hashed_process_data_out);
+      processlist_get_process_pixels(process_list,
+              pid_out,
+              &birth,
+              tfc->t_context->index,
+              &y_out,
+              &height,
+              &hashed_process_data_out);
+      drawing_insert_square( control_flow_data->drawing, y_out, height);
     }
 
     g_free(name);
@@ -1257,7 +1339,7 @@ gint update_time_window_hook(void *hook_data, void *call_data)
       g_info("scrolling near right");
       /* Scroll right, keep right part of the screen */
       guint x = 0;
-      guint width = control_flow_data->drawing->drawing_area->allocation.width;
+      guint width = control_flow_data->drawing->width;
       convert_time_to_pixels(
           *os,
           old_end,
@@ -1271,28 +1353,35 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           control_flow_data->drawing->pixmap,
           x, 0,
           0, 0,
-          -1, -1);
-      
+         control_flow_data->drawing->width-x+SAFETY, -1);
+      if(drawing->damage_begin == drawing->damage_end)
+        drawing->damage_begin = control_flow_data->drawing->width-x;
+      else
+        drawing->damage_begin = 0;
+
+      drawing->damage_end = control_flow_data->drawing->width;
+
       /* Clear the data request background, but not SAFETY */
       gdk_draw_rectangle (control_flow_data->drawing->pixmap,
+          //control_flow_data->drawing->drawing_area->style->black_gc,
           control_flow_data->drawing->drawing_area->style->black_gc,
           TRUE,
-          x+SAFETY, 0,
-          control_flow_data->drawing->width - x,  // do not overlap
-          control_flow_data->drawing->height+SAFETY);
+          drawing->damage_begin+SAFETY, 0,
+          drawing->damage_end - drawing->damage_begin,  // do not overlap
+          control_flow_data->drawing->height);
 
       gtk_widget_queue_draw_area (drawing->drawing_area,
                                 0,0,
-                                control_flow_data->drawing->width - x,
+                                control_flow_data->drawing->width,
                                 control_flow_data->drawing->height);
 
       /* Get new data for the rest. */
       drawing_data_request(control_flow_data->drawing,
           &control_flow_data->drawing->pixmap,
-          x, 0,
-          control_flow_data->drawing->width - x,
+          drawing->damage_begin, 0,
+          drawing->damage_end - drawing->damage_begin,
           control_flow_data->drawing->height);
-  
     } else { 
       //if(ns<os<ns+w)
       //if(ns<os && os<ns+w)
@@ -1303,14 +1392,15 @@ gint update_time_window_hook(void *hook_data, void *call_data)
         g_info("scrolling near left");
         /* Scroll left, keep left part of the screen */
         guint x = 0;
-        guint width = control_flow_data->drawing->drawing_area->allocation.width;
+        guint width = control_flow_data->drawing->width;
         convert_time_to_pixels(
             *ns,
             new_end,
             *os,
             width,
             &x);
-  
+        
+
         /* Copy old data to new location */
         gdk_draw_drawable (control_flow_data->drawing->pixmap,
             control_flow_data->drawing->drawing_area->style->black_gc,
@@ -1319,26 +1409,32 @@ gint update_time_window_hook(void *hook_data, void *call_data)
             x, 0,
             -1, -1);
   
-        *old_time_window = *new_time_window;
+        if(drawing->damage_begin == drawing->damage_end)
+          drawing->damage_end = x;
+        else
+          drawing->damage_end = 
+            control_flow_data->drawing->width;
 
-        /* Clean the data request background */
+        drawing->damage_begin = 0;
+        
         gdk_draw_rectangle (control_flow_data->drawing->pixmap,
           control_flow_data->drawing->drawing_area->style->black_gc,
           TRUE,
-          0, 0,
-          x,  // do not overlap
-          control_flow_data->drawing->height+SAFETY);
+          drawing->damage_begin, 0,
+          drawing->damage_end - drawing->damage_begin,  // do not overlap
+          control_flow_data->drawing->height);
 
-          gtk_widget_queue_draw_area (drawing->drawing_area,
-                                x,0,
-                                control_flow_data->drawing->width - x,
+        gtk_widget_queue_draw_area (drawing->drawing_area,
+                                0,0,
+                                control_flow_data->drawing->width,
                                 control_flow_data->drawing->height);
 
+
         /* Get new data for the rest. */
         drawing_data_request(control_flow_data->drawing,
             &control_flow_data->drawing->pixmap,
-            0, 0,
-            x,
+            drawing->damage_begin, 0,
+            drawing->damage_end - drawing->damage_begin,
             control_flow_data->drawing->height);
     
       } else {
@@ -1355,13 +1451,16 @@ gint update_time_window_hook(void *hook_data, void *call_data)
             TRUE,
             0, 0,
             control_flow_data->drawing->width+SAFETY, // do not overlap
-            control_flow_data->drawing->height+SAFETY);
+            control_flow_data->drawing->height);
 
           gtk_widget_queue_draw_area (drawing->drawing_area,
                                 0,0,
                                 control_flow_data->drawing->width,
                                 control_flow_data->drawing->height);
 
+          drawing->damage_begin = 0;
+          drawing->damage_end = control_flow_data->drawing->width;
+
           drawing_data_request(control_flow_data->drawing,
               &control_flow_data->drawing->pixmap,
               0, 0,
@@ -1380,19 +1479,21 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           TRUE,
           0, 0,
           control_flow_data->drawing->width+SAFETY, // do not overlap
-          control_flow_data->drawing->height+SAFETY);
+          control_flow_data->drawing->height);
 
     gtk_widget_queue_draw_area (drawing->drawing_area,
                                 0,0,
                                 control_flow_data->drawing->width,
                                 control_flow_data->drawing->height);
   
+    drawing->damage_begin = 0;
+    drawing->damage_end = control_flow_data->drawing->width;
+
     drawing_data_request(control_flow_data->drawing,
         &control_flow_data->drawing->pixmap,
         0, 0,
         control_flow_data->drawing->width,
         control_flow_data->drawing->height);
-  
   }
 
 
@@ -1400,6 +1501,45 @@ gint update_time_window_hook(void *hook_data, void *call_data)
   return 0;
 }
 
+gint traceset_notify(void *hook_data, void *call_data)
+{
+  ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
+  Drawing_t *drawing = control_flow_data->drawing;
+  GtkWidget *widget = drawing->drawing_area;
+
+  drawing->damage_begin = 0;
+  drawing->damage_end = drawing->width;
+
+
+  // Clear the image
+  gdk_draw_rectangle (drawing->pixmap,
+        widget->style->black_gc,
+        TRUE,
+        0, 0,
+        drawing->width+SAFETY,
+        drawing->height);
+
+
+  if(drawing->damage_begin < drawing->damage_end)
+  {
+    drawing_data_request(drawing,
+                         &drawing->pixmap,
+                         drawing->damage_begin,
+                         0,
+                         drawing->damage_end-drawing->damage_begin,
+                         drawing->height);
+  }
+
+  gtk_widget_queue_draw_area(drawing->drawing_area,
+                             0,0,
+                             drawing->width,
+                             drawing->height);
+
+  request_background_data(control_flow_data);
+  return FALSE;
+}
+
 gint redraw_notify(void *hook_data, void *call_data)
 {
   ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
@@ -1407,7 +1547,7 @@ gint redraw_notify(void *hook_data, void *call_data)
   GtkWidget *widget = drawing->drawing_area;
 
   drawing->damage_begin = 0;
-  drawing->damage_end = widget->allocation.width;
+  drawing->damage_end = drawing->width;
 
 
   // Clear the image
@@ -1415,8 +1555,8 @@ gint redraw_notify(void *hook_data, void *call_data)
         widget->style->black_gc,
         TRUE,
         0, 0,
-        widget->allocation.width+SAFETY,
-        widget->allocation.height+SAFETY);
+        drawing->width+SAFETY,
+        drawing->height);
 
 
   if(drawing->damage_begin < drawing->damage_end)
@@ -1426,7 +1566,7 @@ gint redraw_notify(void *hook_data, void *call_data)
                          drawing->damage_begin,
                          0,
                          drawing->damage_end-drawing->damage_begin,
-                         widget->allocation.height);
+                         drawing->height);
   }
 
   gtk_widget_queue_draw_area(drawing->drawing_area,
@@ -1445,7 +1585,7 @@ gint continue_notify(void *hook_data, void *call_data)
   Drawing_t *drawing = control_flow_data->drawing;
   GtkWidget *widget = drawing->drawing_area;
 
-  g_assert(widget->allocation.width == drawing->damage_end);
+  //g_assert(widget->allocation.width == drawing->damage_end);
 
   if(drawing->damage_begin < drawing->damage_end)
   {
@@ -1454,7 +1594,7 @@ gint continue_notify(void *hook_data, void *call_data)
                          drawing->damage_begin,
                          0,
                          drawing->damage_end-drawing->damage_begin,
-                         widget->allocation.height);
+                         drawing->height);
   }
 
   return FALSE;
@@ -1606,7 +1746,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   /* Find pixels corresponding to current time . If the time does
    * not fit in the window, show a warning, not supposed to happend. */
   guint x = 0;
-  guint width = control_flow_data->drawing->drawing_area->allocation.width;
+  guint width = control_flow_data->drawing->width;
 
   TimeWindow time_window =
             lttvwindow_get_time_window(control_flow_data->tab);
@@ -1635,8 +1775,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   draw_context->drawable = control_flow_data->drawing->pixmap;
   draw_context->pango_layout = control_flow_data->drawing->pango_layout;
   //draw_context->gc = widget->style->black_gc;
-  draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
-  gdk_gc_copy(draw_context->gc, widget->style->black_gc);
+  //draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap);
+  //gdk_gc_copy(draw_context->gc, widget->style->black_gc);
+  draw_context->gc = control_flow_data->drawing->gc;
  
   if(process != NULL && process->state->s == LTTV_STATE_RUN)
   {
@@ -1740,7 +1881,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
 
   draw_line((void*)&prop_line, (void*)draw_context);
   g_free(prop_line.color);
-  gdk_gc_unref(draw_context->gc);
+  //gdk_gc_unref(draw_context->gc);
 
   /* Reset draw_context of the process for next request */
 
This page took 0.031864 seconds and 4 git commands to generate.