likely/unlikely branch prediction
[lttv.git] / ltt / branches / poly / lttv / modules / gui / controlflow / drawing.c
index 265c68d5563d8461c1f10946523a75d683e8aaf2..918d8c3bc5110c643cb7eb19075017a002eb95be 100644 (file)
@@ -18,6 +18,7 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
+#include <string.h>
 
 #include <lttv/lttv.h>
 #include <lttv/tracecontext.h>
@@ -28,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)
@@ -144,6 +144,8 @@ void drawing_data_request(Drawing_t *drawing,
   convert_pixels_to_time(drawing->width, x+width,
         time_window,
         &time_end);
+  time_end = ltt_time_add(time_end, ltt_time_one); // because main window
+                                                   // doesn't deliver end time.
 
   lttvwindow_events_request_remove_all(tab,
                                        control_flow_data);
@@ -207,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, 16);
+      g_array_set_size(hooks, 10);
 
       /* before hooks */
       
@@ -247,31 +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));
-
+      /**** 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
 
       lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", 
         "out_state", after_schedchange_hook, 
-        &g_array_index(hooks, LttvTraceHook, 14));
+        &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, 15));
+          &g_array_index(hooks, LttvTraceHook, 9));
 
 #if 0
       lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", 
@@ -285,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,
@@ -294,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,
@@ -411,9 +420,6 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
   g_hash_table_foreach(cfd->process_list->process_hash, set_last_start,
                             (gpointer)x);
 
-  cfd->process_list->current_process_info = NULL;
-  cfd->process_list->current_hash_data = NULL;
-
 }
 
 void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
@@ -422,7 +428,12 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss)
   ControlFlowData *cfd = events_request->viewer_data;
   LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss);
   LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp;
+  guint num_cpu = 
+    ltt_trace_per_cpu_tracefile_number(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);
   //cfd->drawing->last_start = LTT_TIME_MIN(current_time,
   //                                        events_request->end_time);
 }
@@ -581,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);
   }
@@ -917,50 +928,6 @@ GtkWidget *drawing_get_widget(Drawing_t *drawing)
   return drawing->vbox;
 }
 
-/* convert_pixels_to_time
- *
- * Convert from window pixel and time interval to an absolute time.
- */
-__inline void convert_pixels_to_time(
-    gint width,
-    guint x,
-    TimeWindow time_window,
-    LttTime *time)
-{
-  double time_d;
-  
-  time_d = time_window.time_width_double;
-  time_d = time_d / (double)width * (double)x;
-  *time = ltt_time_from_double(time_d);
-  *time = ltt_time_add(time_window.start_time, *time);
-}
-
-
-__inline void convert_time_to_pixels(
-    TimeWindow time_window,
-    LttTime time,
-    int width,
-    guint *x)
-{
-  double time_d;
-#ifdef EXTRA_CHECK 
-  g_assert(ltt_time_compare(window_time_begin, time) <= 0 &&
-           ltt_time_compare(window_time_end, time) >= 0);
-#endif //EXTRA_CHECK
-  
-  time = ltt_time_sub(time, time_window.start_time);
-  
-  time_d = ltt_time_to_double(time);
-  
-  if(time_window.time_width_double == 0.0) {
-    g_assert(time_d == 0.0);
-    *x = 0;
-  } else {
-    *x = (guint)(time_d / time_window.time_width_double * (double)width);
-  }
-  
-}
-
 void drawing_draw_line( Drawing_t *drawing,
       GdkPixmap *pixmap,
       guint x1, guint y1,
@@ -1040,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,
@@ -1067,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,
@@ -1101,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;
This page took 0.024979 seconds and 4 git commands to generate.