X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=146cb6113cbc1d8b4bfffe3b0855e7be546bfd64;hb=2d262115fc06b5ffb6038207a6d0c1d5f81763c2;hp=df5291d0656053fcb66667b62a5a77eea6d68e49;hpb=13f86ce27e6f7697d83d912c391517a1239fa378;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
index df5291d0..146cb611 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c
@@ -38,9 +38,8 @@
 
 #include <lttv/lttv.h>
 #include <lttv/hook.h>
-#include <lttvwindow/common.h>
 #include <lttv/state.h>
-#include <lttvwindow/gtktraceset.h>
+#include <lttvwindow/lttvwindow.h>
 
 
 #include "eventhooks.h"
@@ -68,29 +67,15 @@ h_guicontrolflow(MainWindow *mw, LttvTracesetSelector * s, char * key)
   ControlFlowData *control_flow_data = guicontrolflow() ;
   
   control_flow_data->mw = mw;
-  TimeWindow *time_window = guicontrolflow_get_time_window(control_flow_data);
-  time_window->start_time.tv_sec = 0;
-  time_window->start_time.tv_nsec = 0;
-  time_window->time_width.tv_sec = 0;
-  time_window->time_width.tv_nsec = 0;
-
-  LttTime *current_time = guicontrolflow_get_current_time(control_flow_data);
-  current_time->tv_sec = 0;
-  current_time->tv_nsec = 0;
   
-  //g_debug("time width1 : %u",time_window->time_width);
-  
-  get_time_window(mw,
-      time_window);
-  get_current_time(mw,
-      current_time);
-
   //g_debug("time width2 : %u",time_window->time_width);
   // Unreg done in the GuiControlFlow_Destructor
-  reg_update_time_window(update_time_window_hook, control_flow_data,
-        mw);
-  reg_update_current_time(update_current_time_hook, control_flow_data,
-        mw);
+  lttvwindow_register_time_window_notify(mw,
+                                         update_time_window_hook,
+                                         control_flow_data);
+  lttvwindow_register_current_time_notify(mw,
+                                          update_current_time_hook,
+                                          control_flow_data);
   return guicontrolflow_get_widget(control_flow_data) ;
   
 }
@@ -146,6 +131,7 @@ int draw_event_hook(void *hook_data, void *call_data)
 {
   EventRequest *event_request = (EventRequest*)hook_data;
   ControlFlowData *control_flow_data = event_request->control_flow_data;
+  MainWindow *mw = control_flow_data->mw;
 
   LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
 
@@ -156,8 +142,8 @@ int draw_event_hook(void *hook_data, void *call_data)
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  TimeWindow *time_window = 
-    guicontrolflow_get_time_window(control_flow_data);
+  const TimeWindow *time_window = 
+    lttvwindow_get_time_window(mw);
 
   LttTime end_time = ltt_time_add(time_window->start_time,
                                     time_window->time_width);
@@ -272,12 +258,12 @@ int draw_event_hook(void *hook_data, void *call_data)
 
     LttTime time = ltt_event_time(e);
 
-    LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
-                          control_flow_data->time_window.start_time);
+    LttTime window_end = ltt_time_add(time_window->time_width,
+                          time_window->start_time);
 
     
     convert_time_to_pixels(
-        control_flow_data->time_window.start_time,
+        time_window->start_time,
         window_end,
         time,
         width,
@@ -756,8 +742,8 @@ int draw_after_hook(void *hook_data, void *call_data)
   e = tfc->e;
 
   LttTime evtime = ltt_event_time(e);
-  TimeWindow *time_window = 
-    guicontrolflow_get_time_window(control_flow_data);
+  const TimeWindow *time_window = 
+    lttvwindow_get_time_window(control_flow_data->mw);
 
   LttTime end_time = ltt_time_add(time_window->start_time,
                                     time_window->time_width);
@@ -873,12 +859,12 @@ int draw_after_hook(void *hook_data, void *call_data)
 
     //LttTime time = ltt_event_time(e);
 
-    //LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width,
-    //                      control_flow_data->time_window.start_time);
+    //LttTime window_end = ltt_time_add(time_window->time_width,
+    //                      time_window->start_time);
 
     
     //convert_time_to_pixels(
-    //    control_flow_data->time_window.start_time,
+    //    time_window->start_time,
     //    window_end,
     //    time,
     //    width,
@@ -1200,9 +1186,15 @@ int draw_after_hook(void *hook_data, void *call_data)
 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 = 
-    guicontrolflow_get_time_window(control_flow_data);
-  TimeWindow *new_time_window = ((TimeWindow*)call_data);
+    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,
@@ -1264,14 +1256,6 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           0, 0,
           -1, -1);
       
-      convert_time_to_pixels(
-          *ns,
-          new_end,
-          old_end,
-          width,
-          &x);
-
-      *old_time_window = *new_time_window;
       /* 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,
@@ -1279,6 +1263,12 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           x+SAFETY, 0,
           control_flow_data->drawing->width - x,  // do not overlap
           control_flow_data->drawing->height+SAFETY);
+
+      gtk_widget_queue_draw_area (drawing->drawing_area,
+                                0,0,
+                                control_flow_data->drawing->width - x,
+                                control_flow_data->drawing->height);
+
       /* Get new data for the rest. */
       drawing_data_request(control_flow_data->drawing,
           &control_flow_data->drawing->pixmap,
@@ -1286,12 +1276,6 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           control_flow_data->drawing->width - x,
           control_flow_data->drawing->height);
   
-      drawing_refresh(control_flow_data->drawing,
-          0, 0,
-          control_flow_data->drawing->width,
-          control_flow_data->drawing->height);
-
-
     } else { 
       //if(ns<os<ns+w)
       //if(ns<os && os<ns+w)
@@ -1327,6 +1311,12 @@ gint update_time_window_hook(void *hook_data, void *call_data)
           0, 0,
           x,  // do not overlap
           control_flow_data->drawing->height+SAFETY);
+
+          gtk_widget_queue_draw_area (drawing->drawing_area,
+                                x,0,
+                                control_flow_data->drawing->width - x,
+                                control_flow_data->drawing->height);
+
         /* Get new data for the rest. */
         drawing_data_request(control_flow_data->drawing,
             &control_flow_data->drawing->pixmap,
@@ -1334,42 +1324,40 @@ gint update_time_window_hook(void *hook_data, void *call_data)
             x,
             control_flow_data->drawing->height);
     
-        drawing_refresh(control_flow_data->drawing,
-            0, 0,
-            control_flow_data->drawing->width,
-            control_flow_data->drawing->height);
-        
       } else {
-        g_info("scrolling far");
-        /* Cannot reuse any part of the screen : far jump */
-        *old_time_window = *new_time_window;
-        
-        
-        gdk_draw_rectangle (control_flow_data->drawing->pixmap,
-          control_flow_data->drawing->drawing_area->style->black_gc,
-          TRUE,
-          0, 0,
-          control_flow_data->drawing->width+SAFETY, // do not overlap
-          control_flow_data->drawing->height+SAFETY);
-
-        drawing_data_request(control_flow_data->drawing,
-            &control_flow_data->drawing->pixmap,
-            0, 0,
-            control_flow_data->drawing->width,
-            control_flow_data->drawing->height);
-    
-        drawing_refresh(control_flow_data->drawing,
+        if(ltt_time_compare(*ns,*os) == 0)
+        {
+          g_info("not scrolling");
+        } else {
+          g_info("scrolling far");
+          /* Cannot reuse any part of the screen : far jump */
+          
+          
+          gdk_draw_rectangle (control_flow_data->drawing->pixmap,
+            control_flow_data->drawing->drawing_area->style->black_gc,
+            TRUE,
             0, 0,
-            control_flow_data->drawing->width,
-            control_flow_data->drawing->height);
+            control_flow_data->drawing->width+SAFETY, // do not overlap
+            control_flow_data->drawing->height+SAFETY);
+
+          gtk_widget_queue_draw_area (drawing->drawing_area,
+                                0,0,
+                                control_flow_data->drawing->width,
+                                control_flow_data->drawing->height);
+
+          drawing_data_request(control_flow_data->drawing,
+              &control_flow_data->drawing->pixmap,
+              0, 0,
+              control_flow_data->drawing->width,
+              control_flow_data->drawing->height);
+      
+        }
       }
     }
   } else {
     /* Different scale (zoom) */
     g_info("zoom");
 
-    *old_time_window = *new_time_window;
-  
     gdk_draw_rectangle (control_flow_data->drawing->pixmap,
           control_flow_data->drawing->drawing_area->style->black_gc,
           TRUE,
@@ -1377,6 +1365,10 @@ 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+SAFETY);
 
+    gtk_widget_queue_draw_area (drawing->drawing_area,
+                                0,0,
+                                control_flow_data->drawing->width,
+                                control_flow_data->drawing->height);
   
     drawing_data_request(control_flow_data->drawing,
         &control_flow_data->drawing->pixmap,
@@ -1384,10 +1376,6 @@ gint update_time_window_hook(void *hook_data, void *call_data)
         control_flow_data->drawing->width,
         control_flow_data->drawing->height);
   
-    drawing_refresh(control_flow_data->drawing,
-        0, 0,
-        control_flow_data->drawing->width,
-        control_flow_data->drawing->height);
   }
 
 
@@ -1395,29 +1383,41 @@ gint update_time_window_hook(void *hook_data, void *call_data)
   return 0;
 }
 
+gint after_process_traceset_hook(void *hook_data, void *call_data)
+{
+  ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
+  TimeRequest *time_request = (TimeRequest *)call_data;
+
+  drawing_data_request_end(control_flow_data->drawing,
+                           time_request->time_window);
+  return 0; 
+}
+ 
+
+
 gint update_current_time_hook(void *hook_data, void *call_data)
 {
   ControlFlowData *control_flow_data = (ControlFlowData*)hook_data;
+  Drawing_t *drawing = control_flow_data->drawing;
 
-  LttTime* current_time = 
-    guicontrolflow_get_current_time(control_flow_data);
-  *current_time = *((LttTime*)call_data);
+  LttTime current_time = *((LttTime*)call_data);
   
-  TimeWindow time_window;
+  const TimeWindow *time_window =
+            lttvwindow_get_time_window(control_flow_data->mw);
   
-  LttTime time_begin = control_flow_data->time_window.start_time;
-  LttTime width = control_flow_data->time_window.time_width;
+  LttTime time_begin = time_window->start_time;
+  LttTime width = time_window->time_width;
   LttTime half_width = ltt_time_div(width,2.0);
   LttTime time_end = ltt_time_add(time_begin, width);
 
   LttvTracesetContext * tsc =
-        get_traceset_context(control_flow_data->mw);
+        lttvwindow_get_traceset_context(control_flow_data->mw);
   
   LttTime trace_start = tsc->Time_Span->startTime;
   LttTime trace_end = tsc->Time_Span->endTime;
   
-  g_info("New current time HOOK : %u, %u", current_time->tv_sec,
-              current_time->tv_nsec);
+  g_info("New current time HOOK : %u, %u", current_time.tv_sec,
+              current_time.tv_nsec);
 
 
   
@@ -1431,33 +1431,41 @@ gint update_current_time_hook(void *hook_data, void *call_data)
    * at one end of the trace. */
   
   
-  if(ltt_time_compare(*current_time, time_begin) == -1)
+  if(ltt_time_compare(current_time, time_begin) == -1)
   {
-    if(ltt_time_compare(*current_time,
+    TimeWindow new_time_window;
+
+    if(ltt_time_compare(current_time,
           ltt_time_add(trace_start,half_width)) == -1)
       time_begin = trace_start;
     else
-      time_begin = ltt_time_sub(*current_time,half_width);
+      time_begin = ltt_time_sub(current_time,half_width);
   
-    time_window.start_time = time_begin;
-    time_window.time_width = width;
+    new_time_window.start_time = time_begin;
+    new_time_window.time_width = width;
 
-    set_time_window(control_flow_data->mw, &time_window);
+    lttvwindow_report_time_window(control_flow_data->mw, &new_time_window);
   }
-  else if(ltt_time_compare(*current_time, time_end) == 1)
+  else if(ltt_time_compare(current_time, time_end) == 1)
   {
-    if(ltt_time_compare(*current_time, ltt_time_sub(trace_end, half_width)) == 1)
+    TimeWindow new_time_window;
+
+    if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) == 1)
       time_begin = ltt_time_sub(trace_end,width);
     else
-      time_begin = ltt_time_sub(*current_time,half_width);
+      time_begin = ltt_time_sub(current_time,half_width);
   
-    time_window.start_time = time_begin;
-    time_window.time_width = width;
+    new_time_window.start_time = time_begin;
+    new_time_window.time_width = width;
 
-    set_time_window(control_flow_data->mw, &time_window);
+    lttvwindow_report_time_window(control_flow_data->mw, &new_time_window);
     
   }
-  gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
+  //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
+  gtk_widget_queue_draw_area(drawing->drawing_area,
+                             0,0,
+                             drawing->width,
+                             drawing->height);
   
   return 0;
 }
@@ -1667,6 +1675,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data)
  * for each process
  *    draw closing line
  *    new default prev and current
+ * then finally remove reading hooks.
  */
 int  after_data_request(void *hook_data, void *call_data)
 {
@@ -1682,6 +1691,10 @@ int  after_data_request(void *hook_data, void *call_data)
 
   g_hash_table_foreach(process_list->process_hash, draw_closure,
                         (void*)&closure_data);
+
+  /* Remove reading hooks */
+  // Cannot do this here, will break processtrace!
+  //drawing_data_request_end(control_flow_data->drawing);
   
 }