X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=751389bc85053b6f6ed0abf1a94f286f261bebc7;hb=deb3d2f82d104fb338a5c96d0cbe628903cbab96;hp=3d74b502043d2797e3b5f3c6bb8d4d85495bd080;hpb=f61f4dca50e13aa52b1ca3941c8f420848f4353f;p=lttv.git

diff --git a/lttv/modules/gui/controlflow/drawing.c b/lttv/modules/gui/controlflow/drawing.c
index 3d74b502..751389bc 100644
--- a/lttv/modules/gui/controlflow/drawing.c
+++ b/lttv/modules/gui/controlflow/drawing.c
@@ -162,20 +162,11 @@ void drawing_data_request(Drawing_t *drawing,
   {
     /* find the tracehooks */
     LttvTracesetContext *tsc = lttvwindow_get_traceset_context(tab);
-
     LttvTraceset *traceset = tsc->ts;
-
-    guint i, k, l, nb_trace;
-
+    guint i, k, nb_trace;
     LttvTraceState *ts;
-
-    LttvTracefileState *tfs;
-
     GArray *hooks;
-
     LttvTraceHook *th;
-
-    guint ret;
     gint first_after;
 
     nb_trace = lttv_traceset_number(traceset);
@@ -229,6 +220,14 @@ void drawing_data_request(Drawing_t *drawing,
           events_request,
           &hooks);
 
+      lttv_trace_find_hook(ts->parent.t,
+	  LTT_CHANNEL_KERNEL,
+	  LTT_EVENT_SCHED_TRY_WAKEUP,		 
+	  FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_CPU_ID, LTT_FIELD_STATE),
+	  before_trywakeup_hook,
+	  events_request,
+	  &hooks);
+
       lttv_trace_find_hook(ts->parent.t,
           LTT_CHANNEL_KERNEL,
           LTT_EVENT_SYSCALL_EXIT,
@@ -461,7 +460,6 @@ void drawing_data_request(Drawing_t *drawing,
 
 static void set_last_start(gpointer key, gpointer value, gpointer user_data)
 {
-  ProcessInfo *process_info = (ProcessInfo*)key;
   HashedProcessData *hashed_process_data = (HashedProcessData*)value;
   guint x = GPOINTER_TO_UINT(user_data);
 
@@ -483,7 +481,6 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
 {
   g_debug("Begin of data request");
   ControlFlowData *cfd = events_request->viewer_data;
-  LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
   TimeWindow time_window = 
     lttvwindow_get_time_window(cfd->tab);
 
@@ -507,7 +504,7 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
 {
   g_debug("Begin of chunk");
   ControlFlowData *cfd = events_request->viewer_data;
-  LttvTracesetContext *tsc = &tss->parent.parent;
+  LttvTracesetContext *tsc = &tss->parent;
   //LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
   guint i;
   LttvTraceset *traceset = tsc->ts;
@@ -535,7 +532,6 @@ void drawing_request_expose(EventsRequest *events_request,
   guint x_end;
 
   ControlFlowData *cfd = events_request->viewer_data;
-  LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
   Drawing_t *drawing = cfd->drawing;
   
   TimeWindow time_window = 
@@ -1271,20 +1267,7 @@ void drawing_remove_square(Drawing_t *drawing,
 
 void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window)
 {
-  GtkRequisition req;
-  GdkRectangle rect;
-  
-  req.width = drawing->ruler->allocation.width;
-  req.height = drawing->ruler->allocation.height;
-
- 
-  rect.x = 0;
-  rect.y = 0;
-  rect.width = req.width;
-  rect.height = req.height;
-
   gtk_widget_queue_draw(drawing->ruler);
-  //gtk_widget_draw( drawing->ruler, &rect);
 }
 
 /* Redraw the ruler */