X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawitem.c;h=60cf7706dfb05c2d2c06546c293f16f9a406688c;hb=1c736ed5fd25e728fa1df0899be03c4853c556d8;hp=a3085a8aa1824040f13a26c45bf058ac9d072358;hpb=6550d71135aed5d81a76d7d5625757570bcf0819;p=lttv.git

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
index a3085a8a..60cf7706 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawitem.c
@@ -104,6 +104,7 @@
 
 #include <lttv/tracecontext.h>
 #include <lttv/state.h>
+#include <lttv/lttv.h>
 
 #include "drawitem.h"
 
@@ -118,9 +119,7 @@ gboolean draw_text( void *hook_data, void *call_data)
 
   PangoContext *context;
   PangoLayout *layout;
-  PangoAttribute *attribute;
   PangoFontDescription *font_desc;// = pango_font_description_new();
-  gint font_size;
   PangoRectangle ink_rect;
     
   layout = draw_context->pango_layout;
@@ -160,7 +159,7 @@ gboolean draw_text( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x + width <= draw_context->drawinfo.end.x) {
+      if(unlikely(x + width <= draw_context->drawinfo.end.x)) {
         enough_space = TRUE;
         *offset += width;
       }
@@ -185,14 +184,14 @@ gboolean draw_text( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x - width >= draw_context->drawinfo.start.x) {
+      if(unlikely(x - width >= draw_context->drawinfo.start.x)) {
         enough_space = TRUE;
         *offset -= width;
       }
       break;
   }
 
-  if(enough_space)
+  if(unlikely(enough_space))
     gdk_draw_layout_with_colors(draw_context->drawable,
               draw_context->gc,
               x,
@@ -220,7 +219,7 @@ gboolean draw_icon( void *hook_data, void *call_data)
   
   g_assert(lttv_iattribute_find_by_path(attributes, icon_name,
       LTTV_POINTER, &value));
-  if(*(value.v_pointer) == NULL)
+  if(unlikely(*(value.v_pointer) == NULL))
   {
     *(value.v_pointer) = icon_info = g_new(IconStruct,1);
     
@@ -258,7 +257,7 @@ gboolean draw_icon( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x + width <= draw_context->drawinfo.end.x) {
+      if(unlikely(x + width <= draw_context->drawinfo.end.x)) {
         enough_space = TRUE;
         *offset += width;
       }
@@ -283,14 +282,14 @@ gboolean draw_icon( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x - width >= draw_context->drawinfo.start.x) {
+      if(unlikely(x - width >= draw_context->drawinfo.start.x)) {
         enough_space = TRUE;
         *offset -= width;
       }
       break;
   }
 
-  if(enough_space) {
+  if(unlikely(enough_space)) {
     gdk_gc_set_clip_mask(draw_context->gc, icon_info->mask);
 
     gdk_gc_set_clip_origin(
@@ -391,7 +390,7 @@ gboolean draw_arc( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x + width <= draw_context->drawinfo.end.x) {
+      if(unlikely(x + width <= draw_context->drawinfo.end.x)) {
         enough_space = TRUE;
         *offset += width;
       }
@@ -416,14 +415,14 @@ gboolean draw_arc( void *hook_data, void *call_data)
           break;
       }
       /* verify if there is enough space to draw */
-      if(x - width >= draw_context->drawinfo.start.x) {
+      if(unlikely(x - width >= draw_context->drawinfo.start.x)) {
         enough_space = TRUE;
         *offset -= width;
       }
       break;
   }
 
-  if(enough_space)
+  if(unlikely(enough_space))
     gdk_draw_arc(draw_context->drawable, draw_context->gc,
           properties->filled,
           x,