projects / lttv.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
fix glitch with current time marker
[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / eventhooks.c
diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index 154593775217ac2029d20a084678d2c9a2f1b901..cdb7e14aad291e9b537c6b6b046dfa41146992bc 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -141,8 +141,6 @@ gint background_ready(void *hook_data, void *call_data)
 {
   ControlFlowData *control_flow_data = (ControlFlowData *)hook_data;
   LttvTrace *trace = (LttvTrace*)call_data;
-  LttvTracesetContext *tsc =
-        lttvwindow_get_traceset_context(control_flow_data->tab);
 
   control_flow_data->background_info_waiting--;
   
@@ -266,6 +264,7 @@ int event_selected_hook(void *hook_data, void *call_data)
 
   g_debug("DEBUG : event selected by main window : %u", *event_number);
   
+  return 0;
 }
 
 /* Function that selects the color of status&exemode line */
@@ -277,9 +276,6 @@ static inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
   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];
@@ -402,7 +398,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
     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);
   }
   
   { 
@@ -461,12 +456,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
        * 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.middle != -1);
       if(ltt_time_compare(hashed_process_data->next_good_time,
                           evtime) > 0)
       {
@@ -633,13 +622,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
        * 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.middle != -1);
-
       if(ltt_time_compare(hashed_process_data->next_good_time,
                           evtime) > 0)
       {
@@ -919,7 +901,6 @@ int before_schedchange_hook(void *hook_data, void *call_data)
                             control_flow_data->drawing->damage_begin;
       draw_context_out->previous->under->x =
                             control_flow_data->drawing->damage_begin;
-
       g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_begin);
     }
   
@@ -1388,9 +1369,9 @@ int after_schedchange_hook(void *hook_data, void *call_data)
   LttTime evtime = ltt_event_time(e);
 
   /* Add process to process list (if not present) */
-  LttvProcessState *process_out, *process_in;
+  LttvProcessState *process_in;
   LttTime birth;
-  guint y_in = 0, y_out = 0, height = 0, pl_height = 0;
+  guint y_in = 0, height = 0, pl_height = 0;
   HashedProcessData *hashed_process_data_in = NULL;
 
   ProcessList *process_list = control_flow_data->process_list;
@@ -1404,7 +1385,6 @@ int after_schedchange_hook(void *hook_data, void *call_data)
     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);
   }
 
 
@@ -2058,13 +2038,6 @@ int before_execmode_hook(void *hook_data, void *call_data)
   /* 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);
 
   if(likely(ltt_time_compare(hashed_process_data->next_good_time,
                       evtime) > 0))
@@ -2382,13 +2355,6 @@ int before_process_hook(void *hook_data, void *call_data)
      * 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);
-
     if(likely(ltt_time_compare(hashed_process_data->next_good_time,
                         evtime) > 0))
     {
@@ -2750,13 +2716,13 @@ gint update_time_window_hook(void *hook_data, void *call_data)
    * currently shown time interval. (reuse is only for scrolling)
    */
 
-  g_info("Old time window HOOK : %u, %u to %u, %u",
+  g_info("Old time window HOOK : %lu, %lu to %lu, %lu",
       old_time_window->start_time.tv_sec,
       old_time_window->start_time.tv_nsec,
       old_time_window->time_width.tv_sec,
       old_time_window->time_width.tv_nsec);
 
-  g_info("New time window HOOK : %u, %u to %u, %u",
+  g_info("New time window HOOK : %lu, %lu to %lu, %lu",
       new_time_window->start_time.tv_sec,
       new_time_window->start_time.tv_nsec,
       new_time_window->time_width.tv_sec,
@@ -2812,11 +2778,11 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           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,
-                                control_flow_data->drawing->height);
+      gtk_widget_queue_draw(drawing->drawing_area);
+      //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,
@@ -2865,10 +2831,11 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           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,
-                                control_flow_data->drawing->height);
+        gtk_widget_queue_draw(drawing->drawing_area);
+        //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. */
@@ -2894,10 +2861,11 @@ gint update_time_window_hook(void *hook_data, void *call_data)
             control_flow_data->drawing->width+SAFETY, // do not overlap
             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);
+          //gtk_widget_queue_draw_area (drawing->drawing_area,
+          //                      0,0,
+          //                      control_flow_data->drawing->width,
+          //                      control_flow_data->drawing->height);
+          gtk_widget_queue_draw(drawing->drawing_area);
 
           drawing->damage_begin = 0;
           drawing->damage_end = control_flow_data->drawing->width;
@@ -2922,10 +2890,11 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           control_flow_data->drawing->width+SAFETY, // do not overlap
           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);
+    //gtk_widget_queue_draw_area (drawing->drawing_area,
+    //                            0,0,
+    //                            control_flow_data->drawing->width,
+    //                            control_flow_data->drawing->height);
+    gtk_widget_queue_draw(drawing->drawing_area);
   
     drawing->damage_begin = 0;
     drawing->damage_end = control_flow_data->drawing->width;
@@ -2946,7 +2915,6 @@ 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_clear(control_flow_data->drawing);
@@ -2954,24 +2922,6 @@ gint traceset_notify(void *hook_data, void *call_data)
   redraw_notify(control_flow_data, NULL);
 
   request_background_data(control_flow_data);
-#if 0
-  drawing->damage_begin = 0;
-  drawing->damage_end = drawing->width;
-  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);
-#endif //0
  
   return FALSE;
 }
@@ -3008,10 +2958,11 @@ gint redraw_notify(void *hook_data, void *call_data)
                          drawing->height);
   }
 
-  gtk_widget_queue_draw_area(drawing->drawing_area,
-                             0,0,
-                             drawing->width,
-                             drawing->height);
+  gtk_widget_queue_draw(drawing->drawing_area);
+  //gtk_widget_queue_draw_area(drawing->drawing_area,
+  //                           0,0,
+  //                           drawing->width,
+  //                           drawing->height);
   return FALSE;
 
 }
@@ -3021,7 +2972,6 @@ gint continue_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;
 
   //g_assert(widget->allocation.width == drawing->damage_end);
 
@@ -3065,7 +3015,7 @@ gint update_current_time_hook(void *hook_data, void *call_data)
   LttTime trace_start = tsc->time_span.start_time;
   LttTime trace_end = tsc->time_span.end_time;
   
-  g_info("New current time HOOK : %u, %u", current_time.tv_sec,
+  g_info("New current time HOOK : %lu, %lu", current_time.tv_sec,
               current_time.tv_nsec);
 
 
@@ -3114,11 +3064,8 @@ gint update_current_time_hook(void *hook_data, void *call_data)
     lttvwindow_report_time_window(control_flow_data->tab, new_time_window);
     
   }
-  //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
-  gtk_widget_queue_draw_area(drawing->drawing_area,
-                             0,0,
-                             drawing->width,
-                             drawing->height);
+  gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
+                             
   
   return 0;
 }
@@ -3168,9 +3115,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
       
       /* Only draw for processes that are currently in the trace states */
 
-      guint y = 0, height = 0, pl_height = 0;
+      guint y = 0, height = 0;
       ProcessList *process_list = control_flow_data->process_list;
-      LttTime birth = process_info->birth;
 #ifdef EXTRA_CHECK
       /* Should be alike when background info is ready */
       if(control_flow_data->background_info_waiting==0)
@@ -3187,13 +3133,6 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
        * 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);
-
       if(unlikely(ltt_time_compare(hashed_process_data->next_good_time,
                             evtime) <= 0))
       {
@@ -3316,7 +3255,6 @@ int after_request(void *hook_data, void *call_data)
   EventsRequest *events_request = (EventsRequest*)hook_data;
   ControlFlowData *control_flow_data = events_request->viewer_data;
   LttvTracesetState *tss = (LttvTracesetState*)call_data;
-  LttvTracesetContext *tsc = (LttvTracesetContext*)call_data;
   
   ProcessList *process_list = control_flow_data->process_list;
   LttTime end_time = events_request->end_time;
LTTng 2.x Viewer (LTTV)
This page took 0.029449 seconds and 4 git commands to generate.