likely/unlikely branch prediction

[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / drawing.c

diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
index d94a509ef5e383afcba712c80e273efa659d80b5..918d8c3bc5110c643cb7eb19075017a002eb95be 100644 (file)
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -29,7 +29,6 @@
 #include "drawing.h"
 #include "eventhooks.h"
 #include "cfv.h"
-#include "cfv-private.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)
@@ -210,7 +209,7 @@ void drawing_data_request(Drawing_t *drawing,
          associated by id hooks. */
 
       hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook));
-      g_array_set_size(hooks, 15);
+      g_array_set_size(hooks, 10);
 
       /* before hooks */
       
@@ -250,33 +249,38 @@ void drawing_data_request(Drawing_t *drawing,
 
       /* 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));
-#if 0
       /**** DESACTIVATED ****/
       lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL, 
           NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 9));
-#endif //0
 
+      /**** DESACTIVATED ****/
       lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id",
-    NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 9));
+    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, 10));
+          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, 11));
+          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, 12));
+          after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 13));
+#endif //0
 
       lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", 
         "out_state", after_schedchange_hook, 
-        &g_array_index(hooks, LttvTraceHook, 13));
+        &g_array_index(hooks, LttvTraceHook, 8));
 
       lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id", 
           "event_data1", "event_data2", after_process_hook,
-          &g_array_index(hooks, LttvTraceHook, 14));
+          &g_array_index(hooks, LttvTraceHook, 9));
 
 #if 0
       lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", 
@@ -290,7 +294,7 @@ void drawing_data_request(Drawing_t *drawing,
       
       /* Add these hooks to each event_by_id hooks list */
       /* add before */
-      for(k = 0 ; k < hooks->len/2 ; k++) {
+      for(k = 0 ; k < 8 ; k++) {
         hook = g_array_index(hooks, LttvTraceHook, k);
         lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, 
                         hook.id), hook.h,
@@ -299,7 +303,7 @@ void drawing_data_request(Drawing_t *drawing,
       }
 
       /* add after */
-      for(k = hooks->len/2 ; k < hooks->len ; k++) {
+      for(k = 8 ; k < 10 ; k++) {
         hook = g_array_index(hooks, LttvTraceHook, k);
         lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, 
                        hook.id), hook.h,
@@ -588,7 +592,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data )
       (ControlFlowData*)g_object_get_data(
                 G_OBJECT(widget),
                 "control_flow_data");
-  if(drawing->gc == NULL) {
+  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);
   }
@@ -1003,12 +1007,12 @@ void drawing_insert_square(Drawing_t *drawing,
     drawing->width+SAFETY, drawing->height - y);
 
 
-  if (drawing->pixmap)
+  if(likely(drawing->pixmap))
     gdk_pixmap_unref(drawing->pixmap);
 
   drawing->pixmap = pixmap;
   
-  if(drawing->height==1) drawing->height = height;
+  if(unlikely(drawing->height==1)) drawing->height = height;
   else drawing->height += height;
   
   gtk_widget_set_size_request(drawing->drawing_area,
@@ -1030,7 +1034,7 @@ void drawing_remove_square(Drawing_t *drawing,
 {
   GdkPixmap *pixmap;
 
-  if(drawing->height == height) {
+  if(unlikely(drawing->height == height)) {
     pixmap = gdk_pixmap_new(
         drawing->drawing_area->window,
         drawing->width + SAFETY,
@@ -1064,7 +1068,7 @@ void drawing_remove_square(Drawing_t *drawing,
     drawing->height-=height;
   }
 
-  if (drawing->pixmap)
+  if(likely(drawing->pixmap))
     gdk_pixmap_unref(drawing->pixmap);
 
   drawing->pixmap = pixmap;