X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=24f24bd53cd847bd6b8bcc5f5d4296da60599070;hb=043489505bef374a8f28cbdac81ea7dc2d2d4aac;hp=8bad3e96edf5a59a908b5ec99979170f001efff5;hpb=2c82c4dc9a5a322013842e0bf23008d164f369b6;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index 8bad3e96..24f24bd5 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -37,10 +37,9 @@
 #include "cfv.h"
 
 #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
-#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
 
 //FIXME
-#define TRACE_NUMBER 0
+// fixed #define TRACE_NUMBER 0
 #define EXTRA_ALLOC 1024 // pixels
 
 
@@ -72,7 +71,8 @@ GdkColor drawing_colors[NUM_COLORS] =
   { 0, 0x0000, 0xFF00, 0x0000 }, /* COL_RUN_USER_MODE : green */
   { 0, 0x0100, 0x9E00, 0xFFFF }, /* COL_RUN_SYSCALL : pale blue */
   { 0, 0xFF00, 0xFF00, 0x0100 }, /* COL_RUN_TRAP : yellow */
-  { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : red */
+  { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : orange */
+  { 0, 0xFFFF, 0x9400, 0x9600 }, /* COL_RUN_SOFT_IRQ : pink */
   { 0, 0x6600, 0x0000, 0x0000 }, /* COL_WAIT : dark red */
   { 0, 0x7700, 0x7700, 0x0000 }, /* COL_WAIT_CPU : dark yellow */
   { 0, 0x6400, 0x0000, 0x5D00 }, /* COL_ZOMBIE : dark purple */
@@ -122,6 +122,7 @@ void drawing_data_request(Drawing_t *drawing,
   if(width < 0) return ;
   if(height < 0) return ;
 
+
   Tab *tab = drawing->control_flow_data->tab;
   TimeWindow time_window =
               lttvwindow_get_time_window(tab);
@@ -173,15 +174,14 @@ void drawing_data_request(Drawing_t *drawing,
 
     LttvTraceHook *hook;
 
-    LttvTraceHookByFacility *thf;
+    LttvTraceHook *th;
 
     guint ret;
+    gint first_after;
 
     nb_trace = lttv_traceset_number(traceset);
-    // FIXME : eventually request for more traces
-    // for(i = 0 ; i < nb_trace ; i++) {
-    for(i = 0; i<MIN(TRACE_NUMBER+1, nb_trace);i++)
-    {
+    // FIXME  (fixed) : eventually request for more traces
+    for(i = 0 ; i < nb_trace ; i++) {
       EventsRequest *events_request = g_new(EventsRequest, 1);
       // Create the hooks
       //LttvHooks *event = lttv_hooks_new();
@@ -217,194 +217,178 @@ void drawing_data_request(Drawing_t *drawing,
       /* Find the eventtype id for the following events and register the
          associated by id hooks. */
 
-      hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook));
-      hooks = g_array_set_size(hooks, 12);
+      hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18);
 
       /* before hooks */
       
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY,
-          LTT_FIELD_SYSCALL_ID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL_ARCH,
+          LTT_EVENT_SYSCALL_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 0));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT,
-          0, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL_ARCH,
+          LTT_EVENT_SYSCALL_EXIT,
+          NULL,
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 1));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY,
-          LTT_FIELD_TRAP_ID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL_ARCH,
+          LTT_EVENT_TRAP_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_TRAP_ID),
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL_ARCH,
+          LTT_EVENT_TRAP_EXIT,
+          NULL, 
+          before_execmode_hook,
+          events_request,
+          &hooks);
+
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_IRQ_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_IRQ_ID),
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 2));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT,
-          0, 0, 0, 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_IRQ_EXIT,
+          NULL,
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 3));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
-          LTT_FIELD_IRQ_ID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SOFT_IRQ_ENTRY,
+          FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 4));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
-          0, 0, 0, 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SOFT_IRQ_EXIT,
+          NULL,
           before_execmode_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 5));
-      g_assert(!ret);
+          &hooks);
+
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
-          LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SCHED_SCHEDULE,
+          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
           before_schedchange_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 6));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
-          LTT_FIELD_PID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_PROCESS_EXIT,
+          FIELD_ARRAY(LTT_FIELD_PID),
           before_process_exit_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 7));
-      g_assert(!ret);
+          &hooks);
       
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_PROCESS, LTT_EVENT_FREE,
-          LTT_FIELD_PID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_PROCESS_FREE,
+          FIELD_ARRAY(LTT_FIELD_PID),
           before_process_release_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 8));
-      g_assert(!ret);
+          &hooks);
 
-
-#if 0
       lttv_trace_find_hook(ts->parent.t,
-          "core", "process", "event_sub_id", 
-          "event_data1", "event_data2", before_process_hook,
-          &g_array_index(hooks, LttvTraceHook, 7));
-#endif //0
-#if 0
-      lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", 
-          NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7));
-
-      lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL, 
-          NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 8));
-#endif //0
-
-      /* after hooks */
-      
-#if 0
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core","syscall_entry","syscall_id", 
-    NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 8));
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL, 
-          NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 9));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id",
-    NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 10));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "trap_exit", NULL, NULL, NULL, 
-          after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 11));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "irq_entry", "irq_id", NULL, 
-          NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 12));
-
-      /**** DESACTIVATED ****/
-      lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL, 
-          after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 13));
-#endif //0
-#if 0
-      lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", 
-        "out_state", after_schedchange_hook, 
-        &g_array_index(hooks, LttvTraceHook, 8));
+          LTT_FACILITY_LIST,
+          LTT_EVENT_STATEDUMP_END,
+          NULL,
+          before_statedump_end,
+          events_request,
+          &hooks);
 
-      lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id", 
-          "event_data1", "event_data2", after_process_hook,
-          &g_array_index(hooks, LttvTraceHook, 9));
-#endif //0
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE,
-          LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE,
+      /* After hooks */
+      first_after = hooks->len;
+ 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_SCHED_SCHEDULE,
+          FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
           after_schedchange_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 9));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_PROCESS, LTT_EVENT_FORK,
-          LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_PROCESS_FORK,
+          FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
           after_process_fork_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 10));
-      g_assert(!ret);
+          &hooks);
 
-      ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_PROCESS, LTT_EVENT_EXIT,
-          LTT_FIELD_PID, 0, 0,
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_PROCESS_EXIT,
+          FIELD_ARRAY(LTT_FIELD_PID),
           after_process_exit_hook,
           events_request,
-          &g_array_index(hooks, LttvTraceHook, 11));
-      g_assert(!ret);
-
-
+          &hooks);
 
-#if 0
-      lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", 
-          NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7));
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_KERNEL,
+          LTT_EVENT_EXEC,
+          NULL,
+          after_fs_exec_hook,
+          events_request,
+          &hooks);
 
-      lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL, 
-          NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 8));
-#endif //0
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_USER_GENERIC,
+          LTT_EVENT_THREAD_BRAND,
+          FIELD_ARRAY(LTT_FIELD_NAME),
+          after_user_generic_thread_brand_hook,
+          events_request,
+          &hooks);
 
+      lttv_trace_find_hook(ts->parent.t,
+          LTT_FACILITY_LIST,
+          LTT_EVENT_PROCESS_STATE,
+          FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME),
+          after_event_enum_process_hook,
+          events_request,
+          &hooks);
 
       
       /* Add these hooks to each event_by_id hooks list */
       /* add before */
-      for(k = 0 ; k < 9 ; k++) {
-        hook = &g_array_index(hooks, LttvTraceHook, k);
-        for(l=0;l<hook->fac_list->len;l++) {
-          thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
-          lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, thf->id),
-                          thf->h,
-                          thf,
-                          LTTV_PRIO_STATE-5);
-        }
+      for(k = 0 ; k < first_after ; k++) {
+        th = &g_array_index(hooks, LttvTraceHook, k);
+        lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
+                        th->h,
+                        th,
+                        LTTV_PRIO_STATE-5);
       }
 
       /* add after */
-      for(k = 9 ; k < 12 ; k++) {
-        hook = &g_array_index(hooks, LttvTraceHook, k);
-        for(l=0;l<hook->fac_list->len;l++) {
-          thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l);
-          lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, thf->id),
-                         thf->h,
-                         thf,
-                         LTTV_PRIO_STATE+5);
-        }
+      for(k = first_after ; k < hooks->len ; k++) {
+        th = &g_array_index(hooks, LttvTraceHook, k);
+        lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
+                       th->h,
+                       th,
+                       LTTV_PRIO_STATE+5);
       }
-
+      
       events_request->hooks = hooks;
 
       // Fill the events request
@@ -417,7 +401,7 @@ void drawing_data_request(Drawing_t *drawing,
       events_request->end_time = time_end;
       events_request->num_events = G_MAXUINT;
       events_request->end_position = NULL;
-      events_request->trace = i;    /* FIXME */
+      events_request->trace = i; //fixed    /* FIXME */
       events_request->before_chunk_traceset = before_chunk_traceset;
       events_request->before_chunk_trace = NULL;
       events_request->before_chunk_tracefile = NULL;
@@ -436,38 +420,8 @@ void drawing_data_request(Drawing_t *drawing,
                                          time_end.tv_nsec);
 
       lttvwindow_events_request(tab, events_request);
-
     }
-
   }
-
-#if 0
-  lttv_hooks_add(event,
-                 before_schedchange_hook,
-                 events_request,
-                 LTTV_PRIO_STATE-5);
-  lttv_hooks_add(event,
-                 after_schedchange_hook,
-                 events_request,
-                 LTTV_PRIO_STATE+5);
-  lttv_hooks_add(event,
-                 before_execmode_hook,
-                 events_request,
-                 LTTV_PRIO_STATE-5);
-  lttv_hooks_add(event,
-                 after_execmode_hook,
-                 events_request,
-                 LTTV_PRIO_STATE+5);
-  lttv_hooks_add(event,
-                 before_process_hook,
-                 events_request,
-                 LTTV_PRIO_STATE-5);
-  lttv_hooks_add(event,
-                 after_process_hook,
-                 events_request,
-                 LTTV_PRIO_STATE+5);
-#endif //0
-
 }
  
 
@@ -519,14 +473,21 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
 {
   g_debug("Begin of chunk");
   ControlFlowData *cfd = events_request->viewer_data;
-  LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
+  LttvTracesetContext *tsc = &tss->parent.parent;
   //LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
-  guint num_cpu = 
-    ltt_trace_get_num_cpu(tss->parent.traces[TRACE_NUMBER]->t);
-
-  cfd->process_list->current_hash_data = g_new(HashedProcessData*,num_cpu);
-  memset(cfd->process_list->current_hash_data, 0,
-         sizeof(HashedProcessData*)*num_cpu);
+  guint i;
+  LttvTraceset *traceset = tsc->ts;
+  guint nb_trace = lttv_traceset_number(traceset);
+  
+  if(!cfd->process_list->current_hash_data) {
+    cfd->process_list->current_hash_data = g_new(HashedProcessData**,nb_trace);
+    for(i = 0 ; i < nb_trace ; i++) {
+      guint num_cpu = ltt_trace_get_num_cpu(tss->parent.traces[i]->t);
+      cfd->process_list->current_hash_data[i] = g_new(HashedProcessData*,num_cpu);
+      memset(cfd->process_list->current_hash_data[i], 0,
+             sizeof(HashedProcessData*)*num_cpu);
+    }
+  }
   //cfd->drawing->last_start = LTT_TIME_MIN(current_time,
   //                                        events_request->end_time);
 }
@@ -536,7 +497,8 @@ void drawing_request_expose(EventsRequest *events_request,
                             LttvTracesetState *tss,
                             LttTime end_time)
 {
-  gint x, x_end, width;
+  gint x, width;
+  guint x_end;
 
   ControlFlowData *cfd = events_request->viewer_data;
   LttvTracesetContext *tsc = (LttvTracesetContext*)tss;
@@ -563,6 +525,9 @@ void drawing_request_expose(EventsRequest *events_request,
                                x, 0,
                                width, drawing->drawing_area->allocation.height);
  
+  /* Update directly when scrolling */
+  gdk_window_process_updates(drawing->drawing_area->window,
+      TRUE);
 }
 
 
@@ -616,6 +581,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event,
       drawing->alloc_height = drawing->height + EXTRA_ALLOC;
       update_pixmap_size(drawing->control_flow_data->process_list,
                          drawing->alloc_width);
+      update_index_to_pixmap(drawing->control_flow_data->process_list);
     }
     //drawing->height = widget->allocation.height;
 
@@ -682,11 +648,12 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
                 "control_flow_data");
+#if 0
   if(unlikely(drawing->gc == NULL)) {
     drawing->gc = gdk_gc_new(drawing->drawing_area->window);
     gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc);
   }
-
+#endif //0
   TimeWindow time_window = 
       lttvwindow_get_time_window(control_flow_data->tab);
   LttTime current_time = 
@@ -706,11 +673,18 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
       event->area.width, event->area.height);
 #endif //0
   drawing->height = processlist_get_height(control_flow_data->process_list);
+#if 0
   copy_pixmap_to_screen(control_flow_data->process_list,
                         widget->window,
                         widget->style->fg_gc[GTK_WIDGET_STATE (widget)],
                         event->area.x, event->area.y,
                         event->area.width, event->area.height);
+#endif //0
+  copy_pixmap_to_screen(control_flow_data->process_list,
+                        widget->window,
+                        drawing->gc,
+                        event->area.x, event->area.y,
+                        event->area.width, event->area.height);
                         
   
   /* Erase the dotted lines left.. */
@@ -733,7 +707,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
           drawing->width,
           &cursor_x);
 
-
+#if 0
     if(drawing->dotted_gc == NULL) {
 
       drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window);
@@ -750,6 +724,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
                         dash_list,
                         2);
     }
+#endif //0
     gint height_tot = MAX(widget->allocation.height, drawing->height);
     gdk_draw_line(widget->window,
                   drawing->dotted_gc,
@@ -896,8 +871,6 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data)
   drawing->pango_layout =
     gtk_widget_create_pango_layout(drawing->drawing_area, NULL);
 
-  drawing->dotted_gc = NULL;
-
   drawing->height = 1;
   drawing->width = 1;
   drawing->depth = 0;
@@ -984,6 +957,7 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data)
         G_CALLBACK (button_press_event),
         (gpointer)drawing);
   
+
   gtk_widget_show(drawing->ruler);
   gtk_widget_show(drawing->padding);
   gtk_widget_show(drawing->ruler_hbox);
@@ -1000,6 +974,50 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data)
   gdk_colormap_alloc_colors(colormap, drawing_colors, NUM_COLORS, FALSE,
                             TRUE, success);
   
+  drawing->gc =
+    gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+  drawing->dotted_gc =
+    gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+
+  gdk_gc_copy(drawing->gc,
+      main_window_get_widget(control_flow_data->tab)->style->black_gc);
+  gdk_gc_copy(drawing->dotted_gc,
+      main_window_get_widget(control_flow_data->tab)->style->white_gc);
+  
+  gint8 dash_list[] = { 1, 2 };
+  gdk_gc_set_line_attributes(drawing->dotted_gc,
+                             1,
+                             GDK_LINE_ON_OFF_DASH,
+                             GDK_CAP_BUTT,
+                             GDK_JOIN_MITER);
+  gdk_gc_set_dashes(drawing->dotted_gc,
+                    0,
+                    dash_list,
+                    2);
+
+  drawing->ruler_gc_butt = 
+    gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+  gdk_gc_copy(drawing->ruler_gc_butt, 
+      main_window_get_widget(control_flow_data->tab)->style->black_gc);
+  drawing->ruler_gc_round = 
+    gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window));
+  gdk_gc_copy(drawing->ruler_gc_round, 
+      main_window_get_widget(control_flow_data->tab)->style->black_gc);
+
+
+  gdk_gc_set_line_attributes(drawing->ruler_gc_butt,
+                               2,
+                               GDK_LINE_SOLID,
+                               GDK_CAP_BUTT,
+                               GDK_JOIN_MITER);
+
+  gdk_gc_set_line_attributes(drawing->ruler_gc_round,
+                             2,
+                             GDK_LINE_SOLID,
+                             GDK_CAP_ROUND,
+                             GDK_JOIN_ROUND);
+
+  
   return drawing;
 }
 
@@ -1019,8 +1037,11 @@ void drawing_destroy(Drawing_t *drawing)
   if(drawing->gc != NULL)
     gdk_gc_unref(drawing->gc);
   
-  g_free(drawing->pango_layout);
+  g_object_unref(drawing->pango_layout);
   if(drawing->dotted_gc != NULL) gdk_gc_unref(drawing->dotted_gc);
+  if(drawing->ruler_gc_butt != NULL) gdk_gc_unref(drawing->ruler_gc_butt);
+  if(drawing->ruler_gc_round != NULL) gdk_gc_unref(drawing->ruler_gc_round);
+
   g_free(drawing);
   g_info("drawing_destroy end");
 }
@@ -1236,8 +1257,6 @@ void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window)
 static gboolean
 expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
 {
-  /* ruler desactivated */
-  return 0;
   Drawing_t *drawing = (Drawing_t*)user_data;
   TimeWindow time_window = lttvwindow_get_time_window(drawing->control_flow_data->tab);
   gchar text[255];
@@ -1265,15 +1284,8 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
           event->area.width,
           event->area.height);
 
-   GdkGC *gc = gdk_gc_new(drawing->ruler->window);
-   gdk_gc_copy(gc, drawing->ruler->style->black_gc);
-   gdk_gc_set_line_attributes(gc,
-                               2,
-                               GDK_LINE_SOLID,
-                               GDK_CAP_BUTT,
-                               GDK_JOIN_MITER);
   gdk_draw_line (drawing->ruler->window,
-                  gc,
+                  drawing->ruler_gc_butt,
                   event->area.x, 1,
                   event->area.x + event->area.width, 1);
 
@@ -1295,19 +1307,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   global_width += ink_rect.width;
 
   gdk_draw_layout_with_colors(drawing->ruler->window,
-      gc,
+      drawing->ruler_gc_butt,
       0,
       6,
       layout, &foreground, &background);
 
-  gdk_gc_set_line_attributes(gc,
-                             2,
-                             GDK_LINE_SOLID,
-                             GDK_CAP_ROUND,
-                             GDK_JOIN_ROUND);
-
   gdk_draw_line (drawing->ruler->window,
-                   gc,
+                   drawing->ruler_gc_round,
                    1, 1,
                    1, 7);
 
@@ -1322,19 +1328,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   if(global_width <= drawing->ruler->allocation.width)
   {
     gdk_draw_layout_with_colors(drawing->ruler->window,
-      gc,
+      drawing->ruler_gc_butt,
       drawing->ruler->allocation.width - ink_rect.width,
       6,
       layout, &foreground, &background);
 
-    gdk_gc_set_line_attributes(gc,
-                               2,
-                               GDK_LINE_SOLID,
-                               GDK_CAP_ROUND,
-                               GDK_JOIN_ROUND);
-
     gdk_draw_line (drawing->ruler->window,
-                   gc,
+                   drawing->ruler_gc_butt,
                    drawing->ruler->allocation.width-1, 1,
                    drawing->ruler->allocation.width-1, 7);
   }
@@ -1350,19 +1350,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
   if(global_width <= drawing->ruler->allocation.width)
   {
     gdk_draw_layout_with_colors(drawing->ruler->window,
-      gc,
+      drawing->ruler_gc_butt,
       (drawing->ruler->allocation.width - ink_rect.width)/2,
       6,
       layout, &foreground, &background);
 
-    gdk_gc_set_line_attributes(gc,
-                               2,
-                               GDK_LINE_SOLID,
-                               GDK_CAP_ROUND,
-                               GDK_JOIN_ROUND);
-
     gdk_draw_line (drawing->ruler->window,
-                   gc,
+                   drawing->ruler_gc_butt,
                    drawing->ruler->allocation.width/2, 1,
                    drawing->ruler->allocation.width/2, 7);
 
@@ -1371,7 +1365,6 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
 
   }
 
-  gdk_gc_unref(gc);
   g_object_unref(layout);
    
   return FALSE;
@@ -1384,4 +1377,5 @@ motion_notify_ruler(GtkWidget *widget, GdkEventMotion *event, gpointer user_data
 {
   //g_debug("motion");
   //eventually follow mouse and show time here
+  return 0;
 }