X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=trunk%2Flttv%2Flttv%2Fmodules%2Fgui%2Fresourceview%2Fdrawing.c;h=2d3b4a1b4521ef389ae6260418f9044929fbf52b;hb=43ed82b5b0a7de73d473ec7e6f8802e18d729ec3;hp=a4e2b684bf278596eebc597aa75b73c452c023c3;hpb=d5662043c1570c860ee97af8d6cdd95af95a8c50;p=lttv.git

diff --git a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
index a4e2b684..2d3b4a1b 100644
--- a/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
+++ b/trunk/lttv/lttv/modules/gui/resourceview/drawing.c
@@ -210,7 +210,8 @@ void drawing_data_request(Drawing_t *drawing,
       EventsRequest *events_request = g_new(EventsRequest, 1);
       // Create the hooks
       //LttvHooks *event = lttv_hooks_new();
-      LttvHooksById *event_by_id = lttv_hooks_by_id_new();
+      LttvHooksByIdChannelArray *event_by_id_channel =
+        lttv_hooks_by_id_channel_new();
       LttvHooks *before_chunk_traceset = lttv_hooks_new();
       LttvHooks *after_chunk_traceset = lttv_hooks_new();
       LttvHooks *before_request_hook = lttv_hooks_new();
@@ -247,7 +248,7 @@ void drawing_data_request(Drawing_t *drawing,
       /* before hooks */
       
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL_ARCH,
+//          LTT_FACILITY_ARCH,
 //          LTT_EVENT_SYSCALL_ENTRY,
 //          FIELD_ARRAY(LTT_FIELD_SYSCALL_ID),
 //          before_execmode_hook,
@@ -255,7 +256,7 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 //
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL_ARCH,
+//          LTT_FACILITY_ARCH,
 //          LTT_EVENT_SYSCALL_EXIT,
 //          NULL,
 //          before_execmode_hook,
@@ -263,7 +264,7 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 //
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_TRAP_ENTRY,
           FIELD_ARRAY(LTT_FIELD_TRAP_ID),
           before_execmode_hook,
@@ -271,7 +272,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL_ARCH,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_TRAP_EXIT,
           NULL,
           before_execmode_hook,
@@ -279,7 +280,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_IRQ_ENTRY,
           FIELD_ARRAY(LTT_FIELD_IRQ_ID),
           before_execmode_hook,
@@ -287,7 +288,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_IRQ_EXIT,
           NULL,
           before_execmode_hook,
@@ -295,7 +296,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_SOFT_IRQ_RAISE,
           FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
           before_execmode_hook,
@@ -303,7 +304,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_SOFT_IRQ_ENTRY,
           FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID),
           before_execmode_hook,
@@ -311,7 +312,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_SOFT_IRQ_EXIT,
           NULL,
           before_execmode_hook,
@@ -320,7 +321,7 @@ void drawing_data_request(Drawing_t *drawing,
 
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_SCHED_SCHEDULE,
           FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
           before_schedchange_hook,
@@ -328,7 +329,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL,
+//          LTT_CHANNEL_KERNEL,
 //          LTT_EVENT_PROCESS_EXIT,
 //          FIELD_ARRAY(LTT_FIELD_PID),
 //          before_process_exit_hook,
@@ -336,7 +337,7 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 //      
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL,
+//          LTT_CHANNEL_KERNEL,
 //          LTT_EVENT_PROCESS_FREE,
 //          FIELD_ARRAY(LTT_FIELD_PID),
 //          before_process_release_hook,
@@ -352,7 +353,7 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_BLOCK,
           LTT_EVENT_REQUEST_ISSUE,
           FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
           before_bdev_event_hook,
@@ -360,7 +361,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_BLOCK,
           LTT_EVENT_REQUEST_COMPLETE,
           FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION),
           before_bdev_event_hook,
@@ -371,7 +372,7 @@ void drawing_data_request(Drawing_t *drawing,
       first_after = hooks->len;
       
       lttv_trace_find_hook(ts->parent.t,
-          LTT_FACILITY_KERNEL,
+          LTT_CHANNEL_KERNEL,
           LTT_EVENT_SCHED_SCHEDULE,
           FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE),
           after_schedchange_hook,
@@ -379,7 +380,7 @@ void drawing_data_request(Drawing_t *drawing,
           &hooks);
 
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL,
+//          LTT_CHANNEL_KERNEL,
 //          LTT_EVENT_PROCESS_FORK,
 //          FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID),
 //          after_process_fork_hook,
@@ -387,7 +388,7 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 //
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL,
+//          LTT_CHANNEL_KERNEL,
 //          LTT_EVENT_PROCESS_EXIT,
 //          FIELD_ARRAY(LTT_FIELD_PID),
 //          after_process_exit_hook,
@@ -395,7 +396,7 @@ void drawing_data_request(Drawing_t *drawing,
 //          &hooks);
 //
 //      lttv_trace_find_hook(ts->parent.t,
-//          LTT_FACILITY_KERNEL,
+//          LTT_CHANNEL_KERNEL,
 //          LTT_EVENT_EXEC,
 //          NULL,
 //          after_fs_exec_hook,
@@ -423,19 +424,21 @@ void drawing_data_request(Drawing_t *drawing,
       /* add before */
       for(k = 0 ; k < first_after ; k++) {
         th = &g_array_index(hooks, LttvTraceHook, k);
-        lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
-                        th->h,
-                        th,
-                        LTTV_PRIO_STATE-5);
+        lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
+                                                     th->channel, th->id),
+          th->h,
+          th,
+          LTTV_PRIO_STATE-5);
       }
 
       /* add after */
       for(k = first_after ; k < hooks->len ; k++) {
         th = &g_array_index(hooks, LttvTraceHook, k);
-        lttv_hooks_add(lttv_hooks_by_id_find(event_by_id, th->id),
-                       th->h,
-                       th,
-                       LTTV_PRIO_STATE+5);
+        lttv_hooks_add(lttv_hooks_by_id_channel_find(event_by_id_channel,
+                                                     th->channel, th->id),
+          th->h,
+          th,
+          LTTV_PRIO_STATE+5);
       }
       
       events_request->hooks = hooks;
@@ -455,7 +458,7 @@ void drawing_data_request(Drawing_t *drawing,
       events_request->before_chunk_trace = NULL;
       events_request->before_chunk_tracefile = NULL;
       events_request->event = NULL;
-      events_request->event_by_id = event_by_id;
+      events_request->event_by_id_channel = event_by_id_channel;
       events_request->after_chunk_tracefile = NULL;
       events_request->after_chunk_trace = NULL;
       events_request->after_chunk_traceset = after_chunk_traceset;
@@ -479,7 +482,7 @@ static void set_last_start(gpointer key, gpointer value, gpointer user_data)
 {
   //ResourceInfo *process_info = (ResourceInfo*)key;
   HashedResourceData *hashed_process_data = (HashedResourceData*)value;
-  guint x = (guint)user_data;
+  guint x = GPOINTER_TO_UINT(user_data);
 
   hashed_process_data->x.over = x;
   hashed_process_data->x.over_used = FALSE;
@@ -518,7 +521,7 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState
 
   for(i=0; i<RV_RESOURCE_COUNT; i++) {
     g_hash_table_foreach(cfd->process_list->restypes[i].hash_table, set_last_start,
-                         (gpointer)x);
+                         GUINT_TO_POINTER(x));
   }
 
 }