X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=7eecd71dbba2ef35fb52f7bd4f550eedd9b0f9b2;hb=96947fcfd1323ffb5e9f2ac484adb4432b69e90c;hp=3fdfdcc163307481ec9973365840fb983464250c;hpb=e8d11122b46e7e2922e65825623c760f84a4d34f;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 3fdfdcc1..7eecd71d 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -209,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 */
       
@@ -249,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", 
@@ -289,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,
@@ -298,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,