X-Git-Url: https://git.lttng.org/?p=lttv.git;a=blobdiff_plain;f=lttv%2Fmodules%2Fgui%2Fresourceview%2Fdrawing.c;fp=lttv%2Fmodules%2Fgui%2Fresourceview%2Fdrawing.c;h=fb9b1b86474d14402d191be3828cac95c8713e30;hp=ecb8270d8a73b0f0e34444c500a1949f748fba78;hb=26ea84eb31a3d5da3e264d78719b3a74254a9134;hpb=d04fa8383cb80eb3c8397edc0134e301f8f7a882 diff --git a/lttv/modules/gui/resourceview/drawing.c b/lttv/modules/gui/resourceview/drawing.c index ecb8270d..fb9b1b86 100644 --- a/lttv/modules/gui/resourceview/drawing.c +++ b/lttv/modules/gui/resourceview/drawing.c @@ -188,13 +188,7 @@ void drawing_data_request(Drawing_t *drawing, lttv_hooks_add(event_hook,before_execmode_hook , control_flow_data, LTTV_PRIO_STATE-5); lttv_hooks_add(event_hook, after_schedchange_hook, control_flow_data, LTTV_PRIO_STATE+5); - /* find the tracehooks */ - - LttvTraceState *ts; - GArray *hooks; - - guint i, k; - guint first_after; + guint i; guint nb_trace = lttv_traceset_number(traceset); // FIXME (fixed) : eventually request for more traces @@ -228,236 +222,6 @@ void drawing_data_request(Drawing_t *drawing, events_request, LTTV_PRIO_DEFAULT); -#ifdef BABEL_CLEANUP - ts = (LttvTraceState *)tsc->traces[i]; - - /* Find the eventtype id for the following events and register the - associated by id hooks. */ - - hooks = g_array_sized_new(FALSE, FALSE, sizeof(LttvTraceHook), 18); - - /* before hooks */ - -// lttv_trace_find_hook(ts->parent.t, -// LTT_FACILITY_ARCH, -// LTT_EVENT_SYSCALL_ENTRY, -// FIELD_ARRAY(LTT_FIELD_SYSCALL_ID), -// before_execmode_hook, -// events_request, -// &hooks); -// -// lttv_trace_find_hook(ts->parent.t, -// LTT_FACILITY_ARCH, -// LTT_EVENT_SYSCALL_EXIT, -// NULL, -// before_execmode_hook, -// events_request, -// &hooks); -// - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_TRAP_ENTRY, - FIELD_ARRAY(LTT_FIELD_TRAP_ID), - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_TRAP_EXIT, - NULL, - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_PAGE_FAULT_ENTRY, - FIELD_ARRAY(LTT_FIELD_TRAP_ID), - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_PAGE_FAULT_EXIT, - NULL, - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_PAGE_FAULT_NOSEM_ENTRY, - FIELD_ARRAY(LTT_FIELD_TRAP_ID), - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_PAGE_FAULT_NOSEM_EXIT, - NULL, - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_IRQ_ENTRY, - FIELD_ARRAY(LTT_FIELD_IRQ_ID), - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_IRQ_EXIT, - NULL, - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_SOFT_IRQ_RAISE, - FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID), - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_SOFT_IRQ_ENTRY, - FIELD_ARRAY(LTT_FIELD_SOFT_IRQ_ID), - before_execmode_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_SOFT_IRQ_EXIT, - NULL, - before_execmode_hook, - events_request, - &hooks); - - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_SCHED_SCHEDULE, - FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE), - before_schedchange_hook, - events_request, - &hooks); - -// lttv_trace_find_hook(ts->parent.t, -// LTT_CHANNEL_KERNEL, -// LTT_EVENT_PROCESS_EXIT, -// FIELD_ARRAY(LTT_FIELD_PID), -// before_process_exit_hook, -// events_request, -// &hooks); -// -// lttv_trace_find_hook(ts->parent.t, -// LTT_CHANNEL_KERNEL, -// LTT_EVENT_PROCESS_FREE, -// FIELD_ARRAY(LTT_FIELD_PID), -// before_process_release_hook, -// events_request, -// &hooks); -// -// lttv_trace_find_hook(ts->parent.t, -// LTT_FACILITY_LIST, -// LTT_EVENT_STATEDUMP_END, -// NULL, -// before_statedump_end, -// events_request, -// &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_BLOCK, - LTT_EVENT_REQUEST_ISSUE, - FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION), - before_bdev_event_hook, - events_request, - &hooks); - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_BLOCK, - LTT_EVENT_REQUEST_COMPLETE, - FIELD_ARRAY(LTT_FIELD_MAJOR, LTT_FIELD_MINOR, LTT_FIELD_OPERATION), - before_bdev_event_hook, - events_request, - &hooks); - - /* After hooks */ - first_after = hooks->len; - - lttv_trace_find_hook(ts->parent.t, - LTT_CHANNEL_KERNEL, - LTT_EVENT_SCHED_SCHEDULE, - FIELD_ARRAY(LTT_FIELD_PREV_PID, LTT_FIELD_NEXT_PID, LTT_FIELD_PREV_STATE), - after_schedchange_hook, - events_request, - &hooks); - -// lttv_trace_find_hook(ts->parent.t, -// LTT_CHANNEL_KERNEL, -// LTT_EVENT_PROCESS_FORK, -// FIELD_ARRAY(LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID), -// after_process_fork_hook, -// events_request, -// &hooks); -// -// lttv_trace_find_hook(ts->parent.t, -// LTT_CHANNEL_KERNEL, -// LTT_EVENT_PROCESS_EXIT, -// FIELD_ARRAY(LTT_FIELD_PID), -// after_process_exit_hook, -// events_request, -// &hooks); -// -// lttv_trace_find_hook(ts->parent.t, -// LTT_CHANNEL_KERNEL, -// LTT_EVENT_EXEC, -// NULL, -// after_fs_exec_hook, -// events_request, -// &hooks); -// -// lttv_trace_find_hook(ts->parent.t, -// LTT_FACILITY_LIST, -// LTT_EVENT_PROCESS_STATE, -// FIELD_ARRAY(LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME), -// after_event_enum_process_hook, -// events_request, -// &hooks); - - - /* Add these hooks to each event_by_id hooks list */ - /* add before */ - for(k = 0 ; k < first_after ; k++) { - th = &g_array_index(hooks, LttvTraceHook, k); - 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_channel_find(event_by_id_channel, - th->channel, th->id), - th->h, - th, - LTTV_PRIO_STATE+5); - } - - events_request->hooks = hooks; -#endif // Fill the events request events_request->owner = control_flow_data; events_request->viewer_data = control_flow_data;