X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=6d7b844e5e0ec3dd86a259c259716b69eec9788d;hb=93ac601b7487eba4b0733f44117f45fa9dd0baee;hp=6648c9579e1229c30acd4e89ea28eb08d1fd59c8;hpb=1c736ed5fd25e728fa1df0899be03c4853c556d8;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 6648c957..6d7b844e 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -16,6 +16,10 @@ * MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include #include #include @@ -68,8 +72,8 @@ GdkColor drawing_colors[NUM_COLORS] = { 0, 0x0000, 0xFF00, 0x0000 }, /* COL_RUN_USER_MODE : green */ { 0, 0x0100, 0x9E00, 0xFFFF }, /* COL_RUN_SYSCALL : pale blue */ { 0, 0xFF00, 0xFF00, 0x0100 }, /* COL_RUN_TRAP : yellow */ - { 0, 0xFFFF, 0x0000, 0x0000 }, /* COL_RUN_IRQ : red */ - { 0, 0xA3FF, 0x0000, 0x0000 }, /* COL_WAIT : dark red */ + { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : red */ + { 0, 0x6600, 0x0000, 0x0000 }, /* COL_WAIT : dark red */ { 0, 0x7700, 0x7700, 0x0000 }, /* COL_WAIT_CPU : dark yellow */ { 0, 0x6400, 0x0000, 0x5D00 }, /* COL_ZOMBIE : dark purple */ { 0, 0x0700, 0x6400, 0x0000 }, /* COL_WAIT_FORK : dark green */ @@ -159,7 +163,7 @@ void drawing_data_request(Drawing_t *drawing, LttvTraceset *traceset = tsc->ts; - guint i, k, nb_trace; + guint i, k, l, nb_trace; LttvTraceState *ts; @@ -167,7 +171,11 @@ void drawing_data_request(Drawing_t *drawing, GArray *hooks; - LttvTraceHook hook; + LttvTraceHook *hook; + + LttvTraceHookByFacility *thf; + + guint ret; nb_trace = lttv_traceset_number(traceset); // FIXME : eventually request for more traces @@ -210,36 +218,89 @@ void drawing_data_request(Drawing_t *drawing, associated by id hooks. */ hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook)); - g_array_set_size(hooks, 10); + hooks = g_array_set_size(hooks, 13); /* before hooks */ - lttv_trace_find_hook(ts->parent.t, "core","syscall_entry","syscall_id", - NULL, NULL, before_execmode_hook, &g_array_index(hooks, LttvTraceHook, 0)); - - lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL, - NULL, before_execmode_hook, &g_array_index(hooks, LttvTraceHook, 1)); - - lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id", - NULL, NULL, before_execmode_hook, &g_array_index(hooks, LttvTraceHook, 2)); - - lttv_trace_find_hook(ts->parent.t, "core", "trap_exit", NULL, NULL, NULL, - before_execmode_hook, &g_array_index(hooks, LttvTraceHook, 3)); - - lttv_trace_find_hook(ts->parent.t, "core", "irq_entry", "irq_id", NULL, - NULL, before_execmode_hook, &g_array_index(hooks, LttvTraceHook, 4)); - - lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL, - before_execmode_hook, &g_array_index(hooks, LttvTraceHook, 5)); + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY, + LTT_FIELD_SYSCALL_ID, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 0)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT, + 0, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 1)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_ENTRY, + LTT_FIELD_TRAP_ID, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 2)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_TRAP_EXIT, + 0, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 3)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_ENTRY, + LTT_FIELD_IRQ_ID, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 4)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_IRQ_EXIT, + 0, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 5)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, + before_schedchange_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 6)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FIELD_PID, 0, 0, + before_process_exit_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 7)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_FREE, + LTT_FIELD_PID, 0, 0, + before_process_release_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 8)); + g_assert(!ret); - lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", - "out_state", before_schedchange_hook, - &g_array_index(hooks, LttvTraceHook, 6)); - lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id", +#if 0 + lttv_trace_find_hook(ts->parent.t, + "core", "process", "event_sub_id", "event_data1", "event_data2", before_process_hook, &g_array_index(hooks, LttvTraceHook, 7)); - +#endif //0 #if 0 lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7)); @@ -274,7 +335,7 @@ void drawing_data_request(Drawing_t *drawing, lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 13)); #endif //0 - +#if 0 lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", "out_state", after_schedchange_hook, &g_array_index(hooks, LttvTraceHook, 8)); @@ -282,6 +343,40 @@ void drawing_data_request(Drawing_t *drawing, lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id", "event_data1", "event_data2", after_process_hook, &g_array_index(hooks, LttvTraceHook, 9)); +#endif //0 + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_SCHEDCHANGE, + LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, + after_schedchange_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 9)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_FORK, + LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0, + after_process_fork_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 10)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_PROCESS, LTT_EVENT_EXIT, + LTT_FIELD_PID, 0, 0, + after_process_exit_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 11)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_FS, LTT_EVENT_EXEC, + 0, 0, 0, + after_fs_exec_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 12)); + g_assert(!ret); + + #if 0 lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", @@ -295,23 +390,29 @@ void drawing_data_request(Drawing_t *drawing, /* Add these hooks to each event_by_id hooks list */ /* add before */ - 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, - events_request, - LTTV_PRIO_STATE-5); + for(k = 0 ; k < 9 ; k++) { + hook = &g_array_index(hooks, LttvTraceHook, k); + for(l=0;lfac_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_PRIO_STATE-5); + } } /* add after */ - 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, - events_request, - LTTV_PRIO_STATE+5); + for(k = 9 ; k < 13 ; k++) { + hook = &g_array_index(hooks, LttvTraceHook, k); + for(l=0;lfac_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_PRIO_STATE+5); + } } - + events_request->hooks = hooks; // Fill the events request @@ -429,7 +530,7 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss) 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); + ltt_trace_get_num_cpu(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, @@ -559,6 +660,15 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, widget->allocation.height != 1) && drawing->damage_begin < drawing->damage_end) { + + rectangle_pixmap (drawing->control_flow_data->process_list, + drawing->drawing_area->style->black_gc, + TRUE, + 0, 0, + drawing->alloc_width, // do not overlap + -1); + + drawing_data_request(drawing, drawing->damage_begin, 0, @@ -603,6 +713,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.x, event->area.y, event->area.width, event->area.height); #endif //0 + drawing->height = processlist_get_height(control_flow_data->process_list); copy_pixmap_to_screen(control_flow_data->process_list, widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], @@ -611,7 +722,6 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) /* Erase the dotted lines left.. */ -#if 0 if(widget->allocation.height > drawing->height) { gdk_draw_rectangle (widget->window, @@ -621,7 +731,6 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.width, // do not overlap widget->allocation.height - drawing->height); } -#endif //0 if(ltt_time_compare(time_window.start_time, current_time) <= 0 && ltt_time_compare(window_end, current_time) >= 0) { @@ -649,11 +758,11 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) dash_list, 2); } - + gint height_tot = MAX(widget->allocation.height, drawing->height); gdk_draw_line(widget->window, drawing->dotted_gc, cursor_x, 0, - cursor_x, widget->allocation.height); + cursor_x, height_tot); } return FALSE; } @@ -919,7 +1028,7 @@ void drawing_destroy(Drawing_t *drawing) gdk_gc_unref(drawing->gc); g_free(drawing->pango_layout); - if(!drawing->dotted_gc) gdk_gc_unref(drawing->dotted_gc); + if(drawing->dotted_gc != NULL) gdk_gc_unref(drawing->dotted_gc); g_free(drawing); g_info("drawing_destroy end"); } @@ -1135,8 +1244,6 @@ void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window) static gboolean expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { - /* ruler desactivated */ - return 0; Drawing_t *drawing = (Drawing_t*)user_data; TimeWindow time_window = lttvwindow_get_time_window(drawing->control_flow_data->tab); gchar text[255];