X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=83406014bc2431c416865dc80cdff0bf90f0db7a;hb=dd455fb8aa68172162fa7a44c534a405bccf1aa4;hp=e0b92aa3fc526ec49bba9444916e68139249d64e;hpb=0ad10e7f28bf28543b8c131eb5a812ebbeb44216;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 e0b92aa3..83406014 100644
--- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
+++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c
@@ -175,7 +175,7 @@ void drawing_data_request(Drawing_t *drawing,
 
     LttvTraceHook *hook;
 
-    LttvTraceHookByFacility *thf;
+    LttvTraceHook *th;
 
     guint ret;
     gint before_hn, after_hn;
@@ -226,7 +226,7 @@ void drawing_data_request(Drawing_t *drawing,
       /* before hooks */
       
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY,
+          LTT_EVENT_SYSCALL_ENTRY,
           LTT_FIELD_SYSCALL_ID, 0, 0,
           before_execmode_hook,
           events_request,
@@ -234,7 +234,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT,
+          LTT_EVENT_SYSCALL_EXIT,
           0, 0, 0,
           before_execmode_hook,
           events_request,
@@ -242,7 +242,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_ENTRY,
+          LTT_EVENT_TRAP_ENTRY,
           LTT_FIELD_TRAP_ID, 0, 0,
           before_execmode_hook,
           events_request,
@@ -250,7 +250,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_TRAP_EXIT,
+          LTT_EVENT_TRAP_EXIT,
           0, 0, 0, 
           before_execmode_hook,
           events_request,
@@ -258,7 +258,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY,
+          LTT_EVENT_IRQ_ENTRY,
           LTT_FIELD_IRQ_ID, 0, 0,
           before_execmode_hook,
           events_request,
@@ -266,7 +266,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT,
+          LTT_EVENT_IRQ_EXIT,
           0, 0, 0, 
           before_execmode_hook,
           events_request,
@@ -274,7 +274,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY,
+          LTT_EVENT_SOFT_IRQ_ENTRY,
           LTT_FIELD_SOFT_IRQ_ID, 0, 0,
           before_execmode_hook,
           events_request,
@@ -282,7 +282,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT,
+          LTT_EVENT_SOFT_IRQ_EXIT,
           0, 0, 0, 
           before_execmode_hook,
           events_request,
@@ -291,7 +291,7 @@ void drawing_data_request(Drawing_t *drawing,
 
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE,
+          LTT_EVENT_SCHED_SCHEDULE,
           LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE,
           before_schedchange_hook,
           events_request,
@@ -299,7 +299,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT,
+          LTT_EVENT_PROCESS_EXIT,
           LTT_FIELD_PID, 0, 0,
           before_process_exit_hook,
           events_request,
@@ -307,7 +307,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
       
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FREE,
+          LTT_EVENT_PROCESS_FREE,
           LTT_FIELD_PID, 0, 0,
           before_process_release_hook,
           events_request,
@@ -315,7 +315,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) before_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_LIST, LTT_EVENT_STATEDUMP_END,
+          LTT_EVENT_STATEDUMP_END,
           0, 0, 0,
           before_statedump_end,
           events_request,
@@ -374,7 +374,7 @@ void drawing_data_request(Drawing_t *drawing,
       after_hn = before_hn;
       
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_SCHED_SCHEDULE,
+          LTT_EVENT_SCHED_SCHEDULE,
           LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE,
           after_schedchange_hook,
           events_request,
@@ -382,7 +382,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) after_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_FORK,
+          LTT_EVENT_PROCESS_FORK,
           LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0,
           after_process_fork_hook,
           events_request,
@@ -390,7 +390,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) after_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL, LTT_EVENT_PROCESS_EXIT,
+          LTT_EVENT_PROCESS_EXIT,
           LTT_FIELD_PID, 0, 0,
           after_process_exit_hook,
           events_request,
@@ -398,7 +398,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) after_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_FS, LTT_EVENT_EXEC,
+          LTT_EVENT_EXEC,
           0, 0, 0,
           after_fs_exec_hook,
           events_request,
@@ -406,7 +406,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) after_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_USER_GENERIC, LTT_EVENT_THREAD_BRAND,
+          LTT_EVENT_THREAD_BRAND,
           LTT_FIELD_NAME, 0, 0,
           after_user_generic_thread_brand_hook,
           events_request,
@@ -414,7 +414,7 @@ void drawing_data_request(Drawing_t *drawing,
       if(ret) after_hn--;
 
       ret = lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_LIST, LTT_EVENT_PROCESS_STATE,
+          LTT_EVENT_PROCESS_STATE,
           LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME,
           after_event_enum_process_hook,
           events_request,
@@ -436,26 +436,18 @@ void drawing_data_request(Drawing_t *drawing,
       /* Add these hooks to each event_by_id hooks list */
       /* add before */
       for(k = 0 ; k < before_hn ; 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_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
+                          th->h,
+                          th,
                           LTTV_PRIO_STATE-5);
-        }
       }
 
       /* add after */
       for(k = before_hn ; k < after_hn ; 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_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
+                         th->h,
+                         th,
                          LTTV_PRIO_STATE+5);
-        }
       }
       
       events_request->hooks = hooks;