TimeWindow now has end_time
[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / eventhooks.c
index 2b7efbc927c9797cb945c9740f0bab855b49dc6c..197436ef09b70c0e5076010209c33536bf0a365e 100644 (file)
 /* Event hooks are the drawing hooks called during traceset read. They draw the
  * icons, text, lines and background color corresponding to the events read.
  *
- * Two hooks are used for drawing : draw_before and draw_after hooks. The
- * draw_before is called before the state update that occurs with an event and
- * the draw_after hook is called after this state update.
+ * Two hooks are used for drawing : before_schedchange and after_schedchange hooks. The
+ * before_schedchange is called before the state update that occurs with an event and
+ * the after_schedchange hook is called after this state update.
  *
- * The draw_before hooks fulfill the task of drawing the visible objects that
- * corresponds to the data accumulated by the draw_after hook.
+ * The before_schedchange hooks fulfill the task of drawing the visible objects that
+ * corresponds to the data accumulated by the after_schedchange hook.
  *
- * The draw_after hook accumulates the data that need to be shown on the screen
- * (items) into a queue. Then, the next draw_before hook will draw what that
+ * The after_schedchange hook accumulates the data that need to be shown on the screen
+ * (items) into a queue. Then, the next before_schedchange hook will draw what that
  * queue contains. That's the Right Way (TM) of drawing items on the screen,
  * because we need to draw the background first (and then add icons, text, ...
  * over it), but we only know the length of a background region once the state
- * corresponding to it is over, which happens to be at the next draw_before
+ * corresponding to it is over, which happens to be at the next before_schedchange
  * hook.
  *
  * We also have a hook called at the end of a chunk to draw the information left
@@ -97,8 +97,7 @@ static void process_add(gpointer key,
   LttTime birth;
   guint y = 0, height = 0, pl_height = 0;
 
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
 
   pid = process->pid;
   birth = process->creation_time;
@@ -206,7 +205,13 @@ void request_background_data(ControlFlowData *control_flow_data)
                                                    background_ready_hook);
         control_flow_data->background_info_waiting++;
       }
+    } else {
+      /* Data ready. Be 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.
+       */
     }
+    
   }
 
   lttv_hooks_destroy(background_ready_hook);
@@ -224,9 +229,9 @@ void request_background_data(ControlFlowData *control_flow_data)
  * @return The widget created.
  */
 GtkWidget *
-h_guicontrolflow(Tab *tab, LttvTracesetSelector * s, char * key)
+h_guicontrolflow(Tab *tab)
 {
-  g_info("h_guicontrolflow, %p, %p, %s", tab, s, key);
+  g_info("h_guicontrolflow, %p", tab);
   ControlFlowData *control_flow_data = guicontrolflow() ;
   
   control_flow_data->tab = tab;
@@ -265,8 +270,55 @@ int event_selected_hook(void *hook_data, void *call_data)
   
 }
 
+/* Function that selects the color of status&exemode line */
+static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
+{
+  PropertiesLine prop_line;
+  prop_line.line_width = 2;
+  prop_line.style = GDK_LINE_SOLID;
+  prop_line.y = MIDDLE;
+  //GdkColormap *colormap = gdk_colormap_get_system();
+  
+  g_debug("prepare_status_line for state : %s",
+      g_quark_to_string(process->state->s));
+
+  if(process->state->s == LTTV_STATE_RUN) {
+    if(process->state->t == LTTV_STATE_USER_MODE)
+      prop_line.color = drawing_colors[COL_RUN_USER_MODE];
+    else if(process->state->t == LTTV_STATE_SYSCALL)
+      prop_line.color = drawing_colors[COL_RUN_SYSCALL];
+    else if(process->state->t == LTTV_STATE_TRAP)
+      prop_line.color = drawing_colors[COL_RUN_TRAP];
+    else if(process->state->t == LTTV_STATE_IRQ)
+      prop_line.color = drawing_colors[COL_RUN_IRQ];
+    else if(process->state->t == LTTV_STATE_MODE_UNKNOWN)
+      prop_line.color = drawing_colors[COL_MODE_UNKNOWN];
+    else
+      g_assert(FALSE);   /* RUNNING MODE UNKNOWN */
+  } else if(process->state->s == LTTV_STATE_WAIT) {
+    /* We don't show if we wait while in user mode, trap, irq or syscall */
+    prop_line.color = drawing_colors[COL_WAIT];
+  } else if(process->state->s == LTTV_STATE_WAIT_CPU) {
+    /* We don't show if we wait for CPU while in user mode, trap, irq
+     * or syscall */
+    prop_line.color = drawing_colors[COL_WAIT_CPU];
+  } else if(process->state->s == LTTV_STATE_ZOMBIE) {
+    prop_line.color = drawing_colors[COL_ZOMBIE];
+  } else if(process->state->s == LTTV_STATE_WAIT_FORK) {
+    prop_line.color = drawing_colors[COL_WAIT_FORK];
+  } else if(process->state->s == LTTV_STATE_EXIT) {
+    prop_line.color = drawing_colors[COL_EXIT];
+  } else if(process->state->s == LTTV_STATE_UNNAMED) {
+    prop_line.color = drawing_colors[COL_UNNAMED];
+  } else
+    g_assert(FALSE);   /* UNKNOWN STATE */
+  
+  return prop_line;
+
+}
 
-static __inline PropertiesLine prepare_line(LttvProcessState *process)
+#if 0
+static __inline PropertiesLine prepare_status_line(LttvProcessState *process)
 {
   PropertiesLine prop_line;
   prop_line.line_width = 2;
@@ -274,7 +326,8 @@ static __inline PropertiesLine prepare_line(LttvProcessState *process)
   prop_line.y = MIDDLE;
   //GdkColormap *colormap = gdk_colormap_get_system();
   
-  g_debug("prepare_line for state : %s", g_quark_to_string(process->state->s));
+  g_debug("prepare_status_line for state : %s",
+      g_quark_to_string(process->state->s));
 
   /* color of line : status of the process */
   if(process->state->s == LTTV_STATE_UNNAMED)
@@ -285,12 +338,14 @@ static __inline PropertiesLine prepare_line(LttvProcessState *process)
     prop_line.color = drawing_colors[COL_WAIT_CPU];
   else if(process->state->s == LTTV_STATE_EXIT)
     prop_line.color = drawing_colors[COL_EXIT];
+  else if(process->state->s == LTTV_STATE_ZOMBIE)
+    prop_line.color = drawing_colors[COL_ZOMBIE];
   else if(process->state->s == LTTV_STATE_WAIT)
     prop_line.color = drawing_colors[COL_WAIT];
   else if(process->state->s == LTTV_STATE_RUN)
     prop_line.color = drawing_colors[COL_RUN];
   else
-    prop_line.color = drawing_colors[COL_WHITE];
+      prop_line.color = drawing_colors[COL_WHITE];
  
   //gdk_colormap_alloc_color(colormap,
   //                         prop_line.color,
@@ -300,10 +355,10 @@ static __inline PropertiesLine prepare_line(LttvProcessState *process)
   return prop_line;
 
 }
+#endif //0
 
 
-
-/* draw_before_hook
+/* before_schedchange_hook
  * 
  * This function basically draw lines and icons. Two types of lines are drawn :
  * one small (3 pixels?) representing the state of the process and the second
@@ -321,7 +376,7 @@ static __inline PropertiesLine prepare_line(LttvProcessState *process)
  */
 
 
-int draw_before_hook(void *hook_data, void *call_data)
+int before_schedchange_hook(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
@@ -339,114 +394,130 @@ int draw_before_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
             return;
-
   guint width = drawing->width;
 
-  if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) {
-
-    /* we are in a schedchange, before the state update. We must draw the
-     * items corresponding to the state before it changes : now is the right
-     * time to do it.
-     */
+  /* we are in a schedchange, before the state update. We must draw the
+   * items corresponding to the state before it changes : now is the right
+   * time to do it.
+   */
 
-    guint pid_out;
-    guint pid_in;
-    {
-      LttField *f = ltt_event_field(e);
-      LttField *element;
-      element = ltt_field_member(f,0);
-      pid_out = ltt_event_get_long_unsigned(e,element);
-      element = ltt_field_member(f,1);
-      pid_in = ltt_event_get_long_unsigned(e,element);
-      g_debug("out : %u  in : %u", pid_out, pid_in);
-    }
+  guint pid_out;
+  guint pid_in;
+  {
+    LttField *f = ltt_event_field(e);
+    LttField *element;
+    element = ltt_field_member(f,0);
+    pid_out = ltt_event_get_long_unsigned(e,element);
+    element = ltt_field_member(f,1);
+    pid_in = ltt_event_get_long_unsigned(e,element);
+    g_debug("out : %u  in : %u", pid_out, pid_in);
+  }
+  
+  { 
+    /* For the pid_out */
+    /* First, check if the current process is in the state computation
+     * process list. If it is there, that means we must add it right now and
+     * draw items from the beginning of the read for it. If it is not
+     * present, it's a new process and it was not present : it will
+     * be added after the state update.  */
+    LttvProcessState *process;
+    process = lttv_state_find_process(tfs, pid_out);
     
-    { 
-      /* For the pid_out */
-      /* First, check if the current process is in the state computation
-       * process list. If it is there, that means we must add it right now and
-       * draw items from the beginning of the read for it. If it is not
-       * present, it's a new process and it was not present : it will
-       * be added after the state update.  */
-      LttvProcessState *process;
-      process = lttv_state_find_process(tfs, pid_out);
+    if(process != NULL) {
+      /* Well, the process_out existed : we must get it in the process hash
+       * or add it, and draw its items.
+       */
+       /* Add process to process list (if not present) */
+      guint y = 0, height = 0, pl_height = 0;
+      HashedProcessData *hashed_process_data = NULL;
+      ProcessList *process_list = control_flow_data->process_list;
+      LttTime birth = process->creation_time;
+      const gchar *name = g_quark_to_string(process->name);
       
-      if(process != NULL) {
-        /* Well, the process_out existed : we must get it in the process hash
-         * or add it, and draw its items.
-         */
-         /* Add process to process list (if not present) */
-        guint y = 0, height = 0, pl_height = 0;
-        HashedProcessData *hashed_process_data = NULL;
-        ProcessList *process_list = 
-                        guicontrolflow_get_process_list(control_flow_data);
-        LttTime birth = process->creation_time;
-        const gchar *name = g_quark_to_string(process->name);
-        
-        if(processlist_get_process_pixels(process_list,
+      if(processlist_get_process_pixels(process_list,
+              pid_out,
+              process->last_cpu,
+              &birth,
+              tfc->t_context->index,
+              &y,
+              &height,
+              &hashed_process_data) == 1)
+      {
+        g_assert(pid_out == 0 || pid_out != process->ppid);
+        /* Process not present */
+        processlist_add(process_list,
+            pid_out,
+            process->last_cpu,
+            process->ppid,
+            &birth,
+            tfc->t_context->index,
+            name,
+            &pl_height,
+            &hashed_process_data);
+        processlist_get_process_pixels(process_list,
                 pid_out,
+                process->last_cpu,
                 &birth,
                 tfc->t_context->index,
                 &y,
                 &height,
-                &hashed_process_data) == 1)
-        {
-          /* Process not present */
-          processlist_add(process_list,
-              pid_out,
-              &birth,
-              tfc->t_context->index,
-              name,
-              &pl_height,
-              &hashed_process_data);
-          processlist_get_process_pixels(process_list,
-                  pid_out,
-                  &birth,
-                  tfc->t_context->index,
-                  &y,
-                  &height,
-                  &hashed_process_data);
-          drawing_insert_square( drawing, y, height);
-        }
+                &hashed_process_data);
+        drawing_insert_square( drawing, y, height);
+      }
+    
+      /* Now, the process is in the state hash and our own process hash.
+       * We definitely can draw the items related to the ending state.
+       */
       
-        /* Now, the process is in the state hash and our own process hash.
-         * We definitely can draw the items related to the ending state.
-         */
-        
-        /* Check if the x position is unset. In can have been left unset by
-         * a draw closure from a after chunk hook. This should never happen,
-         * because it must be set by before chunk hook to the damage_begin
-         * value.
-         */
-        g_assert(hashed_process_data->x != -1);
+      /* Check if the x position is unset. In can have been left unset by
+       * a draw closure from a after chunk hook. This should never happen,
+       * because it must be set by before chunk hook to the damage_begin
+       * value.
+       */
+      g_assert(hashed_process_data->x.middle != -1);
+      {
+        guint x;
+        convert_time_to_pixels(
+                  time_window.start_time,
+                  end_time,
+                  evtime,
+                  width,
+                  &x);
+
+
+        /* Jump over draw if we are at the same x position */
+        if(x == hashed_process_data->x.middle &&
+             hashed_process_data->x.middle_used)
         {
-          guint x;
+          if(hashed_process_data->x.middle_marked == FALSE) {
+            /* Draw collision indicator */
+            gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+            gdk_draw_point(drawing->pixmap,
+                           drawing->gc,
+                           x,
+                           y+(height/2)-3);
+            hashed_process_data->x.middle_marked = TRUE;
+          }
+          /* jump */
+        } else {
           DrawContext draw_context;
 
-          convert_time_to_pixels(
-              time_window.start_time,
-              end_time,
-              evtime,
-              width,
-              &x);
-
           /* Now create the drawing context that will be used to draw
            * items related to the last state. */
           draw_context.drawable = drawing->pixmap;
           draw_context.gc = drawing->gc;
           draw_context.pango_layout = drawing->pango_layout;
-          draw_context.drawinfo.start.x = hashed_process_data->x;
+          draw_context.drawinfo.start.x = hashed_process_data->x.middle;
           draw_context.drawinfo.end.x = x;
 
-          draw_context.drawinfo.y.over = y;
-          draw_context.drawinfo.y.middle = y+(height/4);
-          draw_context.drawinfo.y.under = y+(height/2)+2;
+          draw_context.drawinfo.y.over = y+1;
+          draw_context.drawinfo.y.middle = y+(height/2);
+          draw_context.drawinfo.y.under = y+height;
 
           draw_context.drawinfo.start.offset.over = 0;
           draw_context.drawinfo.start.offset.middle = 0;
@@ -457,96 +528,120 @@ int draw_before_hook(void *hook_data, void *call_data)
 
           {
             /* Draw the line */
-            PropertiesLine prop_line = prepare_line(process);
+            PropertiesLine prop_line = prepare_s_e_line(process);
             draw_line((void*)&prop_line, (void*)&draw_context);
 
           }
           /* become the last x position */
-          hashed_process_data->x = x;
+          hashed_process_data->x.middle = x;
+          hashed_process_data->x.middle_used = TRUE;
+          hashed_process_data->x.middle_marked = FALSE;
         }
       }
     }
+  }
 
-    {
-      /* For the pid_in */
-      /* First, check if the current process is in the state computation
-       * process list. If it is there, that means we must add it right now and
-       * draw items from the beginning of the read for it. If it is not
-       * present, it's a new process and it was not present : it will
-       * be added after the state update.  */
-      LttvProcessState *process;
-      process = lttv_state_find_process(tfs, pid_in);
+  {
+    /* For the pid_in */
+    /* First, check if the current process is in the state computation
+     * process list. If it is there, that means we must add it right now and
+     * draw items from the beginning of the read for it. If it is not
+     * present, it's a new process and it was not present : it will
+     * be added after the state update.  */
+    LttvProcessState *process;
+    process = lttv_state_find_process(tfs, pid_in);
+    
+    if(process != NULL) {
+      /* Well, the process_out existed : we must get it in the process hash
+       * or add it, and draw its items.
+       */
+       /* Add process to process list (if not present) */
+      guint y = 0, height = 0, pl_height = 0;
+      HashedProcessData *hashed_process_data = NULL;
+      ProcessList *process_list = control_flow_data->process_list;
+      LttTime birth = process->creation_time;
+      const gchar *name = g_quark_to_string(process->name);
       
-      if(process != NULL) {
-        /* Well, the process_out existed : we must get it in the process hash
-         * or add it, and draw its items.
-         */
-         /* Add process to process list (if not present) */
-        guint y = 0, height = 0, pl_height = 0;
-        HashedProcessData *hashed_process_data = NULL;
-        ProcessList *process_list = 
-                        guicontrolflow_get_process_list(control_flow_data);
-        LttTime birth = process->creation_time;
-        const gchar *name = g_quark_to_string(process->name);
-        
-        if(processlist_get_process_pixels(process_list,
+      if(processlist_get_process_pixels(process_list,
+              pid_in,
+              process->last_cpu,
+              &birth,
+              tfc->t_context->index,
+              &y,
+              &height,
+              &hashed_process_data) == 1)
+      {
+        g_assert(pid_in == 0 || pid_in != process->ppid);
+        /* Process not present */
+        processlist_add(process_list,
+            pid_in,
+            process->last_cpu,
+            process->ppid,
+            &birth,
+            tfc->t_context->index,
+            name,
+            &pl_height,
+            &hashed_process_data);
+        processlist_get_process_pixels(process_list,
                 pid_in,
+                process->last_cpu,
                 &birth,
                 tfc->t_context->index,
                 &y,
                 &height,
-                &hashed_process_data) == 1)
-        {
-          /* Process not present */
-          processlist_add(process_list,
-              pid_in,
-              &birth,
-              tfc->t_context->index,
-              name,
-              &pl_height,
-              &hashed_process_data);
-          processlist_get_process_pixels(process_list,
-                  pid_in,
-                  &birth,
-                  tfc->t_context->index,
-                  &y,
-                  &height,
-                  &hashed_process_data);
-          drawing_insert_square( drawing, y, height);
-        }
+                &hashed_process_data);
+        drawing_insert_square( drawing, y, height);
+      }
+    
+      /* Now, the process is in the state hash and our own process hash.
+       * We definitely can draw the items related to the ending state.
+       */
       
-        /* Now, the process is in the state hash and our own process hash.
-         * We definitely can draw the items related to the ending state.
-         */
-        
-        /* Check if the x position is unset. In can have been left unset by
-         * a draw closure from a after chunk hook. This should never happen,
-         * because it must be set by before chunk hook to the damage_begin
-         * value.
-         */
-        g_assert(hashed_process_data->x != -1);
+      /* Check if the x position is unset. In can have been left unset by
+       * a draw closure from a after chunk hook. This should never happen,
+       * because it must be set by before chunk hook to the damage_begin
+       * value.
+       */
+      g_assert(hashed_process_data->x.middle != -1);
+      {
+        guint x;
+
+        convert_time_to_pixels(
+                  time_window.start_time,
+                  end_time,
+                  evtime,
+                  width,
+                  &x);
+
+
+        /* Jump over draw if we are at the same x position */
+        if(x == hashed_process_data->x.middle &&
+            hashed_process_data->x.middle_used)
         {
-          guint x;
+          if(hashed_process_data->x.middle_marked == FALSE) {
+            /* Draw collision indicator */
+            gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+            gdk_draw_point(drawing->pixmap,
+                           drawing->gc,
+                           x,
+                           y+(height/2)-3);
+            hashed_process_data->x.middle_marked = TRUE;
+          }
+          /* jump */
+        } else {
           DrawContext draw_context;
 
-          convert_time_to_pixels(
-              time_window.start_time,
-              end_time,
-              evtime,
-              width,
-              &x);
-
           /* Now create the drawing context that will be used to draw
            * items related to the last state. */
           draw_context.drawable = drawing->pixmap;
           draw_context.gc = drawing->gc;
           draw_context.pango_layout = drawing->pango_layout;
-          draw_context.drawinfo.start.x = hashed_process_data->x;
+          draw_context.drawinfo.start.x = hashed_process_data->x.middle;
           draw_context.drawinfo.end.x = x;
 
-          draw_context.drawinfo.y.over = y;
-          draw_context.drawinfo.y.middle = y+(height/4);
-          draw_context.drawinfo.y.under = y+(height/2)+2;
+          draw_context.drawinfo.y.over = y+1;
+          draw_context.drawinfo.y.middle = y+(height/2);
+          draw_context.drawinfo.y.under = y+height;
 
           draw_context.drawinfo.start.offset.over = 0;
           draw_context.drawinfo.start.offset.middle = 0;
@@ -557,24 +652,19 @@ int draw_before_hook(void *hook_data, void *call_data)
 
           {
             /* Draw the line */
-            PropertiesLine prop_line = prepare_line(process);
+            PropertiesLine prop_line = prepare_s_e_line(process);
             draw_line((void*)&prop_line, (void*)&draw_context);
           }
 
           
           /* become the last x position */
-          hashed_process_data->x = x;
+          hashed_process_data->x.middle = x;
+          hashed_process_data->x.middle_used = TRUE;
+          hashed_process_data->x.middle_marked = FALSE;
         }
       }
     }
-  } else if(strcmp(
-          ltt_eventtype_name(ltt_event_eventtype(e)),"process") == 0) {
-    /* We are in a fork or exit event */
-
-
   }
-
-  
   return 0;
 
 
@@ -596,8 +686,8 @@ int draw_before_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
+
   //if(time < time_beg || time > time_end) return;
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
@@ -614,8 +704,7 @@ int draw_before_hook(void *hook_data, void *call_data)
     LttTime birth;
     guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
+    ProcessList *process_list = control_flow_data->process_list;
 
 
     LttField *f = ltt_event_field(e);
@@ -835,7 +924,7 @@ int draw_before_hook(void *hook_data, void *call_data)
       prop_text_out.foreground->green = 0xffff;
       prop_text_out.foreground->blue = 0x0000;
     }
-    else if(process_out->state->s == LTTV_STATE_EXIT)
+    else if(process_out->state->s == LTTV_STATE_ZOMBIE)
     {
       prop_text_out.foreground->red = 0xffff;
       prop_text_out.foreground->green = 0x0000;
@@ -868,7 +957,7 @@ int draw_before_hook(void *hook_data, void *call_data)
       prop_text_out.text = "WF->";
     else if(process_out->state->s == LTTV_STATE_WAIT_CPU)
       prop_text_out.text = "WC->";
-    else if(process_out->state->s == LTTV_STATE_EXIT)
+    else if(process_out->state->s == LTTV_STATE_ZOMBIE)
       prop_text_out.text = "E->";
     else if(process_out->state->s == LTTV_STATE_WAIT)
       prop_text_out.text = "W->";
@@ -911,7 +1000,7 @@ int draw_before_hook(void *hook_data, void *call_data)
       prop_line_out.color->green = 0xffff;
       prop_line_out.color->blue = 0x0000;
     }
-    else if(process_out->state->s == LTTV_STATE_EXIT)
+    else if(process_out->state->s == LTTV_STATE_ZOMBIE)
     {
       prop_line_out.color->red = 0xffff;
       prop_line_out.color->green = 0x0000;
@@ -1059,7 +1148,7 @@ int draw_before_hook(void *hook_data, void *call_data)
       prop_text_in.foreground->green = 0xffff;
       prop_text_in.foreground->blue = 0x0000;
     }
-    else if(process_in->state->s == LTTV_STATE_EXIT)
+    else if(process_in->state->s == LTTV_STATE_ZOMBIE)
     {
       prop_text_in.foreground->red = 0xffff;
       prop_text_in.foreground->green = 0x0000;
@@ -1093,7 +1182,7 @@ int draw_before_hook(void *hook_data, void *call_data)
       prop_text_in.text = "WF->";
     else if(process_in->state->s == LTTV_STATE_WAIT_CPU)
       prop_text_in.text = "WC->";
-    else if(process_in->state->s == LTTV_STATE_EXIT)
+    else if(process_in->state->s == LTTV_STATE_ZOMBIE)
       prop_text_in.text = "E->";
     else if(process_in->state->s == LTTV_STATE_WAIT)
       prop_text_in.text = "W->";
@@ -1134,7 +1223,7 @@ int draw_before_hook(void *hook_data, void *call_data)
       prop_line_in.color->green = 0xffff;
       prop_line_in.color->blue = 0x0000;
     }
-    else if(process_in->state->s == LTTV_STATE_EXIT)
+    else if(process_in->state->s == LTTV_STATE_ZOMBIE)
     {
       prop_line_in.color->red = 0xffff;
       prop_line_in.color->green = 0x0000;
@@ -1191,7 +1280,7 @@ int draw_before_hook(void *hook_data, void *call_data)
 
 }
 
-/* draw_after_hook
+/* after_schedchange_hook
  * 
  * The draw after hook is called by the reading API to have a
  * particular event drawn on the screen.
@@ -1201,7 +1290,7 @@ int draw_before_hook(void *hook_data, void *call_data)
  * This function adds items to be drawn in a queue for each process.
  * 
  */
-int draw_after_hook(void *hook_data, void *call_data)
+int after_schedchange_hook(void *hook_data, void *call_data)
 {
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
@@ -1218,8 +1307,7 @@ int draw_after_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
@@ -1227,85 +1315,87 @@ int draw_after_hook(void *hook_data, void *call_data)
 
   guint width = control_flow_data->drawing->width;
 
-  if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) {
+  /* Add process to process list (if not present) */
+  LttvProcessState *process_out, *process_in;
+  LttTime birth;
+  guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
+  HashedProcessData *hashed_process_data_in = NULL;
 
-    g_debug("schedchange!");
-    
-    {
-      /* Add process to process list (if not present) */
-      LttvProcessState *process_out, *process_in;
-      LttTime birth;
-      guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
-      HashedProcessData *hashed_process_data_in = NULL;
-
-      ProcessList *process_list =
-        guicontrolflow_get_process_list(control_flow_data);
-      
-      guint pid_in;
-      {
-        guint pid_out;
-        LttField *f = ltt_event_field(e);
-        LttField *element;
-        element = ltt_field_member(f,0);
-        pid_out = ltt_event_get_long_unsigned(e,element);
-        element = ltt_field_member(f,1);
-        pid_in = ltt_event_get_long_unsigned(e,element);
-        g_debug("out : %u  in : %u", pid_out, pid_in);
-      }
+  ProcessList *process_list = control_flow_data->process_list;
+  
+  guint pid_in;
+  {
+    guint pid_out;
+    LttField *f = ltt_event_field(e);
+    LttField *element;
+    element = ltt_field_member(f,0);
+    pid_out = ltt_event_get_long_unsigned(e,element);
+    element = ltt_field_member(f,1);
+    pid_in = ltt_event_get_long_unsigned(e,element);
+    g_debug("out : %u  in : %u", pid_out, pid_in);
+  }
 
 
-      /* Find process pid_in in the list... */
-      process_in = lttv_state_find_process(tfs, pid_in);
-      /* It should exist, because we are after the state update. */
-      g_assert(process_in != NULL);
+  /* Find process pid_in in the list... */
+  process_in = lttv_state_find_process(tfs, pid_in);
+  /* It should exist, because we are after the state update. */
+  g_assert(process_in != NULL);
 
-      birth = process_in->creation_time;
-      const gchar *name = g_quark_to_string(process_in->name);
+  birth = process_in->creation_time;
+  const gchar *name = g_quark_to_string(process_in->name);
 
-      if(processlist_get_process_pixels(process_list,
-              pid_in,
-              &birth,
-              tfc->t_context->index,
-              &y_in,
-              &height,
-              &hashed_process_data_in) == 1)
-      {
-        /* Process not present */
-        processlist_add(process_list,
+  if(processlist_get_process_pixels(process_list,
+          pid_in,
+          process_in->last_cpu,
+          &birth,
+          tfc->t_context->index,
+          &y_in,
+          &height,
+          &hashed_process_data_in) == 1)
+  {
+    g_assert(pid_in == 0 || pid_in != process_in->ppid);
+    /* Process not present */
+    processlist_add(process_list,
+        pid_in,
+        process_in->last_cpu,
+        process_in->ppid,
+        &birth,
+        tfc->t_context->index,
+        name,
+        &pl_height,
+        &hashed_process_data_in);
+    processlist_get_process_pixels(process_list,
             pid_in,
+            process_in->last_cpu,
             &birth,
             tfc->t_context->index,
-            name,
-            &pl_height,
+            &y_in,
+            &height,
             &hashed_process_data_in);
-        processlist_get_process_pixels(process_list,
-                pid_in,
-                &birth,
-                tfc->t_context->index,
-                &y_in,
-                &height,
-                &hashed_process_data_in);
-        drawing_insert_square( control_flow_data->drawing, y_in, height);
-      }
-
-      convert_time_to_pixels(
-          time_window.start_time,
-          end_time,
-          evtime,
-          width,
-          &hashed_process_data_in->x);
-    }
-  } else if(strcmp(
-          ltt_eventtype_name(ltt_event_eventtype(e)),"process") == 0) {
-    /* We are in a fork or exit event */
-
+    drawing_insert_square( control_flow_data->drawing, y_in, height);
+  }
 
+  guint new_x;
+  
+  convert_time_to_pixels(
+      time_window.start_time,
+      end_time,
+      evtime,
+      width,
+      &new_x);
+
+  if(hashed_process_data_in->x.middle != new_x) {
+    hashed_process_data_in->x.middle = new_x;
+    hashed_process_data_in->x.middle_used = FALSE;
+    hashed_process_data_in->x.middle_marked = FALSE;
   }
 
   return 0;
 
 
 
+
+
 #if 0
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
@@ -1323,8 +1413,8 @@ int draw_after_hook(void *hook_data, void *call_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
+
   //if(time < time_beg || time > time_end) return;
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
@@ -1342,8 +1432,7 @@ int draw_after_hook(void *hook_data, void *call_data)
     LttTime birth;
     guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
 
-    ProcessList *process_list =
-      guicontrolflow_get_process_list(control_flow_data);
+    ProcessList *process_list = control_flow_data->process_list;
 
 
     LttField *f = ltt_event_field(e);
@@ -1509,7 +1598,7 @@ int draw_after_hook(void *hook_data, void *call_data)
       prop_text_out.foreground->green = 0xffff;
       prop_text_out.foreground->blue = 0x0000;
     }
-    else if(process_out->state->s == LTTV_STATE_EXIT)
+    else if(process_out->state->s == LTTV_STATE_ZOMBIE)
     {
       prop_text_out.foreground->red = 0xffff;
       prop_text_out.foreground->green = 0x0000;
@@ -1541,7 +1630,7 @@ int draw_after_hook(void *hook_data, void *call_data)
       prop_text_out.text = "WF";
     else if(process_out->state->s == LTTV_STATE_WAIT_CPU)
       prop_text_out.text = "WC";
-    else if(process_out->state->s == LTTV_STATE_EXIT)
+    else if(process_out->state->s == LTTV_STATE_ZOMBIE)
       prop_text_out.text = "E";
     else if(process_out->state->s == LTTV_STATE_WAIT)
       prop_text_out.text = "W";
@@ -1650,7 +1739,7 @@ int draw_after_hook(void *hook_data, void *call_data)
       prop_text_in.foreground->green = 0xffff;
       prop_text_in.foreground->blue = 0x0000;
     }
-    else if(process_in->state->s == LTTV_STATE_EXIT)
+    else if(process_in->state->s == LTTV_STATE_ZOMBIE)
     {
       prop_text_in.foreground->red = 0xffff;
       prop_text_in.foreground->green = 0x0000;
@@ -1683,7 +1772,7 @@ int draw_after_hook(void *hook_data, void *call_data)
       prop_text_in.text = "WF";
     else if(process_in->state->s == LTTV_STATE_WAIT_CPU)
       prop_text_in.text = "WC";
-    else if(process_in->state->s == LTTV_STATE_EXIT)
+    else if(process_in->state->s == LTTV_STATE_ZOMBIE)
       prop_text_in.text = "E";
     else if(process_in->state->s == LTTV_STATE_WAIT)
       prop_text_in.text = "W";
@@ -1759,28 +1848,691 @@ int draw_after_hook(void *hook_data, void *call_data)
 #endif //0
 }
 
-
-
-
-gint update_time_window_hook(void *hook_data, void *call_data)
+#if 0
+static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process)
 {
-  ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
-  Drawing_t *drawing = control_flow_data->drawing;
-
-  const TimeWindowNotifyData *time_window_nofify_data = 
-                          ((const TimeWindowNotifyData *)call_data);
-
-  TimeWindow *old_time_window = 
-    time_window_nofify_data->old_time_window;
-  TimeWindow *new_time_window = 
-    time_window_nofify_data->new_time_window;
+  PropertiesLine prop_line;
+  prop_line.line_width = 1;
+  prop_line.style = GDK_LINE_SOLID;
+  prop_line.y = OVER;
+  //GdkColormap *colormap = gdk_colormap_get_system();
   
-  /* Update the ruler */
-  drawing_update_ruler(control_flow_data->drawing,
-                       new_time_window);
-
-
-  /* Two cases : zoom in/out or scrolling */
+  /* color of line : execution mode of the process */
+  if(process->state->t == LTTV_STATE_USER_MODE)
+    prop_line.color = drawing_colors[COL_USER_MODE];
+  else if(process->state->t == LTTV_STATE_SYSCALL)
+    prop_line.color = drawing_colors[COL_SYSCALL];
+  else if(process->state->t == LTTV_STATE_TRAP)
+    prop_line.color = drawing_colors[COL_TRAP];
+  else if(process->state->t == LTTV_STATE_IRQ)
+    prop_line.color = drawing_colors[COL_IRQ];
+  else if(process->state->t == LTTV_STATE_MODE_UNKNOWN)
+    prop_line.color = drawing_colors[COL_MODE_UNKNOWN];
+  else
+    prop_line.color = drawing_colors[COL_WHITE];
+  //gdk_colormap_alloc_color(colormap,
+  //                         prop_line.color,
+  //                         FALSE,
+  //                         TRUE);
+  
+  return prop_line;
+
+}
+#endif //0
+
+
+/* before_execmode_hook
+ * 
+ * This function basically draw lines and icons. Two types of lines are drawn :
+ * one small (3 pixels?) representing the state of the process and the second
+ * type is thicker (10 pixels?) representing on which CPU a process is running
+ * (and this only in running state).
+ *
+ * Extremums of the lines :
+ * x_min : time of the last event context for this process kept in memory.
+ * x_max : time of the current event.
+ * y : middle of the process in the process list. The process is found in the
+ * list, therefore is it's position in pixels.
+ *
+ * The choice of lines'color is defined by the context of the last event for this
+ * process.
+ */
+
+
+int before_execmode_hook(void *hook_data, void *call_data)
+{
+  EventsRequest *events_request = (EventsRequest*)hook_data;
+  ControlFlowData *control_flow_data = events_request->viewer_data;
+  Drawing_t *drawing = control_flow_data->drawing;
+
+  LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+
+  LttvTracefileState *tfs = (LttvTracefileState *)call_data;
+  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+
+  LttEvent *e;
+  e = tfc->e;
+
+  LttTime evtime = ltt_event_time(e);
+  TimeWindow time_window = 
+    lttvwindow_get_time_window(control_flow_data->tab);
+
+  LttTime end_time = time_window.end_time;
+
+  if(ltt_time_compare(evtime, time_window.start_time) == -1
+        || ltt_time_compare(evtime, end_time) == 1)
+            return;
+
+  guint width = drawing->width;
+
+  /* we are in a execmode, before the state update. We must draw the
+   * items corresponding to the state before it changes : now is the right
+   * time to do it.
+   */
+  /* For the pid */
+  LttvProcessState *process = tfs->process;
+  g_assert(process != NULL);
+
+  guint pid = process->pid;
+
+  /* Well, the process_out existed : we must get it in the process hash
+   * or add it, and draw its items.
+   */
+   /* Add process to process list (if not present) */
+  guint y = 0, height = 0, pl_height = 0;
+  HashedProcessData *hashed_process_data = NULL;
+  ProcessList *process_list = control_flow_data->process_list;
+  LttTime birth = process->creation_time;
+  const gchar *name = g_quark_to_string(process->name);
+  
+  if(processlist_get_process_pixels(process_list,
+          pid,
+          process->last_cpu,
+          &birth,
+          tfc->t_context->index,
+          &y,
+          &height,
+          &hashed_process_data) == 1)
+  {
+    g_assert(pid == 0 || pid != process->ppid);
+    /* Process not present */
+    processlist_add(process_list,
+        pid,
+        process->last_cpu,
+        process->ppid,
+        &birth,
+        tfc->t_context->index,
+        name,
+        &pl_height,
+        &hashed_process_data);
+    processlist_get_process_pixels(process_list,
+            pid,
+            process->last_cpu,
+            &birth,
+            tfc->t_context->index,
+            &y,
+            &height,
+            &hashed_process_data);
+    drawing_insert_square( drawing, y, height);
+  }
+
+  /* Now, the process is in the state hash and our own process hash.
+   * We definitely can draw the items related to the ending state.
+   */
+  
+  /* Check if the x position is unset. In can have been left unset by
+   * a draw closure from a after chunk hook. This should never happen,
+   * because it must be set by before chunk hook to the damage_begin
+   * value.
+   */
+  g_assert(hashed_process_data->x.over != -1);
+  {
+    guint x;
+
+    convert_time_to_pixels(
+        time_window.start_time,
+        end_time,
+        evtime,
+        width,
+        &x);
+
+
+    /* Jump over draw if we are at the same x position */
+    if(x == hashed_process_data->x.middle &&
+             hashed_process_data->x.middle_used)
+    {
+      if(hashed_process_data->x.middle_marked == FALSE) {
+        /* Draw collision indicator */
+        gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+        gdk_draw_point(drawing->pixmap,
+                       drawing->gc,
+                       x,
+                       y+(height/2)-3);
+        hashed_process_data->x.middle_marked = TRUE;
+      }
+      /* jump */
+    } else {
+
+      DrawContext draw_context;
+      /* Now create the drawing context that will be used to draw
+       * items related to the last state. */
+      draw_context.drawable = drawing->pixmap;
+      draw_context.gc = drawing->gc;
+      draw_context.pango_layout = drawing->pango_layout;
+      draw_context.drawinfo.start.x = hashed_process_data->x.middle;
+      draw_context.drawinfo.end.x = x;
+
+      draw_context.drawinfo.y.over = y+1;
+      draw_context.drawinfo.y.middle = y+(height/2);
+      draw_context.drawinfo.y.under = y+height;
+
+      draw_context.drawinfo.start.offset.over = 0;
+      draw_context.drawinfo.start.offset.middle = 0;
+      draw_context.drawinfo.start.offset.under = 0;
+      draw_context.drawinfo.end.offset.over = 0;
+      draw_context.drawinfo.end.offset.middle = 0;
+      draw_context.drawinfo.end.offset.under = 0;
+
+      {
+        /* Draw the line */
+        PropertiesLine prop_line = prepare_s_e_line(process);
+        draw_line((void*)&prop_line, (void*)&draw_context);
+
+      }
+      /* become the last x position */
+      hashed_process_data->x.middle = x;
+      hashed_process_data->x.middle_used = TRUE;
+      hashed_process_data->x.middle_marked = FALSE;
+    }
+  }
+  
+  return 0;
+}
+
+/* after_execmode_hook
+ * 
+ * The draw after hook is called by the reading API to have a
+ * particular event drawn on the screen.
+ * @param hook_data ControlFlowData structure of the viewer. 
+ * @param call_data Event context.
+ *
+ * This function adds items to be drawn in a queue for each process.
+ * 
+ */
+int after_execmode_hook(void *hook_data, void *call_data)
+{
+  EventsRequest *events_request = (EventsRequest*)hook_data;
+  ControlFlowData *control_flow_data = events_request->viewer_data;
+
+  LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+
+  LttvTracefileState *tfs = (LttvTracefileState *)call_data;
+  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+
+  LttEvent *e;
+  e = tfc->e;
+
+  LttTime evtime = ltt_event_time(e);
+  TimeWindow time_window = 
+    lttvwindow_get_time_window(control_flow_data->tab);
+
+  LttTime end_time = time_window.end_time;
+
+  if(ltt_time_compare(evtime, time_window.start_time) == -1
+        || ltt_time_compare(evtime, end_time) == 1)
+            return;
+
+  guint width = control_flow_data->drawing->width;
+
+  /* Add process to process list (if not present) */
+  LttvProcessState *process;
+  LttTime birth;
+  guint y = 0, height = 0, pl_height = 0;
+  HashedProcessData *hashed_process_data = NULL;
+
+  ProcessList *process_list = control_flow_data->process_list;
+
+  /* Find process pid_in in the list... */
+  process = tfs->process;
+  /* It should exist, because we are after the state update. */
+  g_assert(process != NULL);
+
+  guint pid = process->pid;
+
+  birth = process->creation_time;
+  const gchar *name = g_quark_to_string(process->name);
+
+  if(processlist_get_process_pixels(process_list,
+          pid,
+          process->last_cpu,
+          &birth,
+          tfc->t_context->index,
+          &y,
+          &height,
+          &hashed_process_data) == 1)
+  {
+    g_assert(pid == 0 || pid != process->ppid);
+    /* Process not present */
+    processlist_add(process_list,
+        pid,
+        process->last_cpu,
+        process->ppid,
+        &birth,
+        tfc->t_context->index,
+        name,
+        &pl_height,
+        &hashed_process_data);
+    processlist_get_process_pixels(process_list,
+            pid,
+            process->last_cpu,
+            &birth,
+            tfc->t_context->index,
+            &y,
+            &height,
+            &hashed_process_data);
+    drawing_insert_square( control_flow_data->drawing, y, height);
+  }
+  
+  guint new_x;
+  
+  convert_time_to_pixels(
+      time_window.start_time,
+      end_time,
+      evtime,
+      width,
+      &new_x);
+
+  if(hashed_process_data->x.middle != new_x) {
+    hashed_process_data->x.middle = new_x;
+    hashed_process_data->x.middle_used = FALSE;
+    hashed_process_data->x.middle_marked = FALSE;
+  }
+
+  return 0;
+}
+
+
+
+/* before_process_hook
+ * 
+ * Draw lines for process event.
+ *
+ * @param hook_data ControlFlowData structure of the viewer. 
+ * @param call_data Event context.
+ *
+ * This function adds items to be drawn in a queue for each process.
+ * 
+ */
+int before_process_hook(void *hook_data, void *call_data)
+{
+  EventsRequest *events_request = (EventsRequest*)hook_data;
+  ControlFlowData *control_flow_data = events_request->viewer_data;
+  Drawing_t *drawing = control_flow_data->drawing;
+
+  LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+
+  LttvTracefileState *tfs = (LttvTracefileState *)call_data;
+  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+
+  LttEvent *e;
+  e = tfc->e;
+
+  LttTime evtime = ltt_event_time(e);
+  TimeWindow time_window = 
+    lttvwindow_get_time_window(control_flow_data->tab);
+
+  LttTime end_time = time_window.end_time;
+
+  if(ltt_time_compare(evtime, time_window.start_time) == -1
+        || ltt_time_compare(evtime, end_time) == 1)
+            return;
+
+  guint width = control_flow_data->drawing->width;
+
+  guint sub_id;
+  {
+    LttField *f = ltt_event_field(e);
+    LttField *element;
+    element = ltt_field_member(f,0);
+    sub_id = ltt_event_get_long_unsigned(e,element);
+  }
+
+  if(sub_id == 3) { /* exit */
+
+    /* Add process to process list (if not present) */
+    LttvProcessState *process = tfs->process;
+    guint pid = process->pid;
+    LttTime birth;
+    guint y = 0, height = 0, pl_height = 0;
+    HashedProcessData *hashed_process_data = NULL;
+
+    ProcessList *process_list = control_flow_data->process_list;
+    
+    g_assert(process != NULL);
+
+    birth = process->creation_time;
+    const gchar *name = g_quark_to_string(process->name);
+
+    if(processlist_get_process_pixels(process_list,
+            pid,
+            process->last_cpu,
+            &birth,
+            tfc->t_context->index,
+            &y,
+            &height,
+            &hashed_process_data) == 1)
+    {
+      g_assert(pid == 0 || pid != process->ppid);
+      /* Process not present */
+      processlist_add(process_list,
+          pid,
+          process->last_cpu,
+          process->ppid,
+          &birth,
+          tfc->t_context->index,
+          name,
+          &pl_height,
+          &hashed_process_data);
+      processlist_get_process_pixels(process_list,
+              pid,
+              process->last_cpu,
+              &birth,
+              tfc->t_context->index,
+              &y,
+              &height,
+              &hashed_process_data);
+      drawing_insert_square( control_flow_data->drawing, y, height);
+    }
+
+    /* Now, the process is in the state hash and our own process hash.
+     * We definitely can draw the items related to the ending state.
+     */
+    
+    /* Check if the x position is unset. In can have been left unset by
+     * a draw closure from a after chunk hook. This should never happen,
+     * because it must be set by before chunk hook to the damage_begin
+     * value.
+     */
+    g_assert(hashed_process_data->x.over != -1);
+    {
+      guint x;
+
+      convert_time_to_pixels(
+          time_window.start_time,
+          end_time,
+          evtime,
+          width,
+          &x);
+
+
+      /* Jump over draw if we are at the same x position */
+      if(x == hashed_process_data->x.middle &&
+             hashed_process_data->x.middle_used)
+      { 
+        if(hashed_process_data->x.middle_marked == FALSE) {
+          /* Draw collision indicator */
+          gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+          gdk_draw_point(drawing->pixmap,
+                         drawing->gc,
+                         x,
+                         y+(height/2)-3);
+          hashed_process_data->x.middle_marked = TRUE;
+        }
+        /* jump */
+      } else {
+        DrawContext draw_context;
+
+        /* Now create the drawing context that will be used to draw
+         * items related to the last state. */
+        draw_context.drawable = drawing->pixmap;
+        draw_context.gc = drawing->gc;
+        draw_context.pango_layout = drawing->pango_layout;
+        draw_context.drawinfo.start.x = hashed_process_data->x.middle;
+        draw_context.drawinfo.end.x = x;
+
+        draw_context.drawinfo.y.over = y+1;
+        draw_context.drawinfo.y.middle = y+(height/2);
+        draw_context.drawinfo.y.under = y+height;
+
+        draw_context.drawinfo.start.offset.over = 0;
+        draw_context.drawinfo.start.offset.middle = 0;
+        draw_context.drawinfo.start.offset.under = 0;
+        draw_context.drawinfo.end.offset.over = 0;
+        draw_context.drawinfo.end.offset.middle = 0;
+        draw_context.drawinfo.end.offset.under = 0;
+
+        {
+          /* Draw the line */
+          PropertiesLine prop_line = prepare_s_e_line(process);
+          draw_line((void*)&prop_line, (void*)&draw_context);
+
+        }
+        /* become the last x position */
+        hashed_process_data->x.middle = x;
+        hashed_process_data->x.middle_used = TRUE;
+        hashed_process_data->x.middle_marked = FALSE;
+      }
+    }
+
+  }
+  return 0;
+
+}
+
+
+
+
+
+
+/* after_process_hook
+ * 
+ * Create the processlist entry for the child process. Put the last
+ * position in x at the current time value.
+ *
+ * @param hook_data ControlFlowData structure of the viewer. 
+ * @param call_data Event context.
+ *
+ * This function adds items to be drawn in a queue for each process.
+ * 
+ */
+int after_process_hook(void *hook_data, void *call_data)
+{
+  EventsRequest *events_request = (EventsRequest*)hook_data;
+  ControlFlowData *control_flow_data = events_request->viewer_data;
+
+  LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+
+  LttvTracefileState *tfs = (LttvTracefileState *)call_data;
+  LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context;
+
+  LttEvent *e;
+  e = tfc->e;
+
+  LttTime evtime = ltt_event_time(e);
+  TimeWindow time_window = 
+    lttvwindow_get_time_window(control_flow_data->tab);
+
+  LttTime end_time = time_window.end_time;
+
+  if(ltt_time_compare(evtime, time_window.start_time) == -1
+        || ltt_time_compare(evtime, end_time) == 1)
+            return;
+
+  guint width = control_flow_data->drawing->width;
+
+  guint sub_id;
+  guint param1;
+  {
+    LttField *f = ltt_event_field(e);
+    LttField *element;
+    element = ltt_field_member(f,0);
+    sub_id = ltt_event_get_long_unsigned(e,element);
+    element = ltt_field_member(f,1);
+    param1 = ltt_event_get_long_unsigned(e,element);
+  }
+
+  if(sub_id == 2) { /* fork */
+    
+    guint child_pid = param1;
+    /* Add process to process list (if not present) */
+    LttvProcessState *process_child;
+    LttTime birth;
+    guint y_child = 0, height = 0, pl_height = 0;
+    HashedProcessData *hashed_process_data_child = NULL;
+
+    ProcessList *process_list = control_flow_data->process_list;
+
+    /* Find child in the list... */
+    process_child = lttv_state_find_process(tfs, child_pid);
+    /* It should exist, because we are after the state update. */
+    g_assert(process_child != NULL);
+
+    birth = process_child->creation_time;
+    const gchar *name = g_quark_to_string(process_child->name);
+
+    if(processlist_get_process_pixels(process_list,
+            child_pid,
+            process_child->last_cpu,
+            &birth,
+            tfc->t_context->index,
+            &y_child,
+            &height,
+            &hashed_process_data_child) == 1)
+    {
+      g_assert(child_pid == 0 || child_pid != process_child->ppid);
+      /* Process not present */
+      processlist_add(process_list,
+          child_pid,
+          process_child->last_cpu,
+          process_child->ppid,
+          &birth,
+          tfc->t_context->index,
+          name,
+          &pl_height,
+          &hashed_process_data_child);
+      processlist_get_process_pixels(process_list,
+              child_pid,
+              process_child->last_cpu,
+              &birth,
+              tfc->t_context->index,
+              &y_child,
+              &height,
+              &hashed_process_data_child);
+      drawing_insert_square( control_flow_data->drawing, y_child, height);
+    }
+
+    guint new_x;
+    convert_time_to_pixels(
+        time_window.start_time,
+        end_time,
+        evtime,
+        width,
+        &new_x);
+
+    if(hashed_process_data_child->x.over != new_x) {
+      hashed_process_data_child->x.over = new_x;
+      hashed_process_data_child->x.over_used = FALSE;
+      hashed_process_data_child->x.over_marked = FALSE;
+    }
+    if(hashed_process_data_child->x.middle != new_x) {
+      hashed_process_data_child->x.middle = new_x;
+      hashed_process_data_child->x.middle_used = FALSE;
+      hashed_process_data_child->x.middle_marked = FALSE;
+    }
+    if(hashed_process_data_child->x.under != new_x) {
+      hashed_process_data_child->x.under = new_x;
+      hashed_process_data_child->x.under_used = FALSE;
+      hashed_process_data_child->x.under_marked = FALSE;
+    }
+
+  } else if(sub_id == 3) { /* exit */
+
+    /* Add process to process list (if not present) */
+    LttvProcessState *process = tfs->process;
+    guint pid = process->pid;
+    LttTime birth;
+    guint y = 0, height = 0, pl_height = 0;
+    HashedProcessData *hashed_process_data = NULL;
+
+    ProcessList *process_list = control_flow_data->process_list;
+
+    /* It should exist, because we are after the state update. */
+    g_assert(process != NULL);
+
+    birth = process->creation_time;
+    const gchar *name = g_quark_to_string(process->name);
+
+    if(processlist_get_process_pixels(process_list,
+            pid,
+            process->last_cpu,
+            &birth,
+            tfc->t_context->index,
+            &y,
+            &height,
+            &hashed_process_data) == 1)
+    {
+      g_assert(pid == 0 || pid != process->ppid);
+      /* Process not present */
+      processlist_add(process_list,
+          pid,
+          process->last_cpu,
+          process->ppid,
+          &birth,
+          tfc->t_context->index,
+          name,
+          &pl_height,
+          &hashed_process_data);
+      processlist_get_process_pixels(process_list,
+              pid,
+              process->last_cpu,
+              &birth,
+              tfc->t_context->index,
+              &y,
+              &height,
+              &hashed_process_data);
+      drawing_insert_square( control_flow_data->drawing, y, height);
+    }
+
+    guint new_x;
+    convert_time_to_pixels(
+        time_window.start_time,
+        end_time,
+        evtime,
+        width,
+        &new_x);
+    if(hashed_process_data->x.middle != new_x) {
+      hashed_process_data->x.middle = new_x;
+      hashed_process_data->x.middle_used = FALSE;
+      hashed_process_data->x.middle_marked = FALSE;
+    }
+
+
+  }
+  return 0;
+
+}
+
+
+gint update_time_window_hook(void *hook_data, void *call_data)
+{
+  ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
+  Drawing_t *drawing = control_flow_data->drawing;
+
+  const TimeWindowNotifyData *time_window_nofify_data = 
+                          ((const TimeWindowNotifyData *)call_data);
+
+  TimeWindow *old_time_window = 
+    time_window_nofify_data->old_time_window;
+  TimeWindow *new_time_window = 
+    time_window_nofify_data->new_time_window;
+  
+  /* Update the ruler */
+  drawing_update_ruler(control_flow_data->drawing,
+                       new_time_window);
+
+
+  /* Two cases : zoom in/out or scrolling */
   
   /* In order to make sure we can reuse the old drawing, the scale must
    * be the same and the new time interval being partly located in the
@@ -1806,10 +2558,8 @@ gint update_time_window_hook(void *hook_data, void *call_data)
     g_info("scrolling");
     LttTime *ns = &new_time_window->start_time;
     LttTime *os = &old_time_window->start_time;
-    LttTime old_end = ltt_time_add(old_time_window->start_time,
-                                    old_time_window->time_width);
-    LttTime new_end = ltt_time_add(new_time_window->start_time,
-                                    new_time_window->time_width);
+    LttTime old_end = old_time_window->end_time;
+    LttTime new_end = new_time_window->end_time;
     //if(ns<os+w<ns+w)
     //if(ns<os+w && os+w<ns+w)
     //if(ns<old_end && os<ns)
@@ -2024,6 +2774,9 @@ gint redraw_notify(void *hook_data, void *call_data)
   drawing->damage_begin = 0;
   drawing->damage_end = drawing->width;
 
+  /* fun feature, to be separated someday... */
+  drawing_clear(control_flow_data->drawing);
+  processlist_clear(control_flow_data->process_list);
 
   // Clear the image
   gdk_draw_rectangle (drawing->pixmap,
@@ -2048,7 +2801,6 @@ gint redraw_notify(void *hook_data, void *call_data)
                              0,0,
                              drawing->width,
                              drawing->height);
   return FALSE;
 
 }
@@ -2088,7 +2840,12 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   
   LttTime time_begin = time_window.start_time;
   LttTime width = time_window.time_width;
-  LttTime half_width = ltt_time_div(width,2.0);
+  LttTime half_width;
+  {
+    guint64 time_ll = ltt_time_to_uint64(width);
+    time_ll = time_ll >> 1; /* divide by two */
+    half_width = ltt_time_from_uint64(time_ll);
+  }
   LttTime time_end = ltt_time_add(time_begin, width);
 
   LttvTracesetContext * tsc =
@@ -2124,6 +2881,7 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   
     new_time_window.start_time = time_begin;
     new_time_window.time_width = width;
+    new_time_window.end_time = ltt_time_add(time_begin, width);
 
     lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
   }
@@ -2138,6 +2896,7 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   
     new_time_window.start_time = time_begin;
     new_time_window.time_width = width;
+    new_time_window.end_time = ltt_time_add(time_begin, width);
 
     lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
     
@@ -2158,44 +2917,6 @@ typedef struct _ClosureData {
 } ClosureData;
   
 
-/* find_process
- * Input : A trace and a PID.
- * 
- * - For each CPU of the trace
- *   - Search in trace states by PID and CPU key
- *     - For each ProcessState found
- *       - If state is not LTTV_STATE_WAIT
- *        - Then this process state is the current one for this PID.
- *        - Stop search.
- * - If no ProcessState found, return NULL.
- * - If all ProcessState were in LTTV_STATE_WAIT state, return one of
- *   them arbitrarily.
- *   Than means state is LTTV_STATE_WAIT, CPU unknown.
- */
-static LttvProcessState *find_process(LttvTraceState *tstate, guint pid)
-{
-  guint cpu_num = ltt_trace_per_cpu_tracefile_number(tstate->parent.t);
-  GQuark cpu_name;
-  guint i;
-  
-  LttvProcessState *real_state = NULL;
-  
-  for(i=0;i<cpu_num;i++) {
-    cpu_name = ((LttvTracefileState*)tstate->parent.tracefiles[i])->cpu_name;
-    LttvProcessState *state = lttv_state_find_process_from_trace(tstate,
-                                                                 cpu_name,
-                                                                 pid);
-    
-    if(state != NULL) {
-      real_state = state;
-      if(state->state->s != LTTV_STATE_WAIT)
-        break;
-    }
-  }
-  return real_state;
-}
-
-
 void draw_closure(gpointer key, gpointer value, gpointer user_data)
 {
   ProcessInfo *process_info = (ProcessInfo*)key;
@@ -2213,8 +2934,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
   TimeWindow time_window = 
     lttvwindow_get_time_window(control_flow_data->tab);
 
-  LttTime end_time = ltt_time_add(time_window.start_time,
-                                    time_window.time_width);
+  LttTime end_time = time_window.end_time;
 
   if(ltt_time_compare(evtime, time_window.start_time) == -1
         || ltt_time_compare(evtime, end_time) == 1)
@@ -2231,19 +2951,21 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
      * be added after the state update.  */
     g_assert(lttv_traceset_number(tsc->ts) > 0);
 
-    LttvTraceState *trace_state =
-      (LttvTraceState*)tsc->traces[process_info->trace_num];
+    /* tracefiles[0] is ok here, because we draw for every PID, and
+     * assume CPU 0 for PID 0 //FIXME */
+    LttvTracefileState *tfs =
+      (LttvTracefileState*)tsc->traces[process_info->trace_num]->tracefiles[0];
 
     LttvProcessState *process;
-    process = find_process(trace_state, process_info->pid);
+    process = lttv_state_find_process(tfs,
+                                      process_info->pid);
 
     if(process != NULL) {
       
       /* Only draw for processes that are currently in the trace states */
 
       guint y = 0, height = 0, pl_height = 0;
-      ProcessList *process_list = 
-                      guicontrolflow_get_process_list(control_flow_data);
+      ProcessList *process_list = control_flow_data->process_list;
       LttTime birth = process_info->birth;
       
       /* Should be alike when background info is ready */
@@ -2255,6 +2977,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
       /* process HAS to be present */
       g_assert(processlist_get_process_pixels(process_list,
               process_info->pid,
+              process_info->cpu,
               &birth,
               process_info->trace_num,
               &y,
@@ -2270,10 +2993,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
        * because it must be set by before chunk hook to the damage_begin
        * value.
        */
-      g_assert(hashed_process_data->x != -1);
+      g_assert(hashed_process_data->x.over != -1);
       {
         guint x;
-        DrawContext draw_context;
 
         convert_time_to_pixels(
             time_window.start_time,
@@ -2282,17 +3004,18 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
             width,
             &x);
 
+        DrawContext draw_context;
+
         /* Now create the drawing context that will be used to draw
          * items related to the last state. */
         draw_context.drawable = drawing->pixmap;
         draw_context.gc = drawing->gc;
         draw_context.pango_layout = drawing->pango_layout;
-        draw_context.drawinfo.start.x = hashed_process_data->x;
         draw_context.drawinfo.end.x = x;
 
-        draw_context.drawinfo.y.over = y;
-        draw_context.drawinfo.y.middle = y+(height/4);
-        draw_context.drawinfo.y.under = y+(height/2)+2;
+        draw_context.drawinfo.y.over = y+1;
+        draw_context.drawinfo.y.middle = y+(height/2);
+        draw_context.drawinfo.y.under = y+height;
 
         draw_context.drawinfo.start.offset.over = 0;
         draw_context.drawinfo.start.offset.middle = 0;
@@ -2300,18 +3023,46 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
         draw_context.drawinfo.end.offset.over = 0;
         draw_context.drawinfo.end.offset.middle = 0;
         draw_context.drawinfo.end.offset.under = 0;
-
+#if 0
+        /* Jump over draw if we are at the same x position */
+        if(x == hashed_process_data->x.over)
         {
+          /* jump */
+        } else {
+          draw_context.drawinfo.start.x = hashed_process_data->x.over;
           /* Draw the line */
-          PropertiesLine prop_line = prepare_line(process);
+          PropertiesLine prop_line = prepare_execmode_line(process);
           draw_line((void*)&prop_line, (void*)&draw_context);
 
+          hashed_process_data->x.over = x;
         }
+#endif //0
 
-        /* special case LTTV_STATE_WAIT : CPU is unknown. */
-        
-        /* become the last x position */
-        hashed_process_data->x = x;
+        if(x == hashed_process_data->x.middle &&
+            hashed_process_data->x.middle_used) {
+          if(hashed_process_data->x.middle_marked == FALSE) {
+            /* Draw collision indicator */
+            gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]);
+            gdk_draw_point(drawing->pixmap,
+                           drawing->gc,
+                           x,
+                           y+(height/2)-3);
+            hashed_process_data->x.middle_marked = TRUE;
+          }
+          /* Jump */
+        } else {
+          draw_context.drawinfo.start.x = hashed_process_data->x.middle;
+          /* Draw the line */
+          PropertiesLine prop_line = prepare_s_e_line(process);
+          draw_line((void*)&prop_line, (void*)&draw_context);
+
+           /* become the last x position */
+          if(x != hashed_process_data->x.middle) {
+            hashed_process_data->x.middle = x;
+            /* but don't use the pixel */
+            hashed_process_data->x.middle_used = FALSE;
+          }
+        }
       }
     }
   }
@@ -2355,8 +3106,7 @@ int after_request(void *hook_data, void *call_data)
   LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data);
   LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data);
   
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
   LttTime end_time = events_request->end_time;
 
   ClosureData closure_data;
@@ -2387,8 +3137,7 @@ int after_chunk(void *hook_data, void *call_data)
   LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc);
   LttTime end_time;
   
-  ProcessList *process_list =
-    guicontrolflow_get_process_list(control_flow_data);
+  ProcessList *process_list = control_flow_data->process_list;
 
   if(tfc != NULL)
     end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);
This page took 0.046684 seconds and 4 git commands to generate.