X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=43b15af751357fcfb7c60be7ccc7280e36f1ba36;hb=c9b629ae28a1d55249875faad19607874e759724;hp=6d7b844e5e0ec3dd86a259c259716b69eec9788d;hpb=ae71a09a1ce0b18713df2069dae87e4451cbc7e2;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 6d7b844e..43b15af7 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -72,7 +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, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : red */ + { 0, 0xFFFF, 0x5E00, 0x0000 }, /* COL_RUN_IRQ : orange */ + { 0, 0xFFFF, 0x9400, 0x9600 }, /* COL_RUN_SOFT_IRQ : pink */ { 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 */ @@ -122,6 +123,7 @@ void drawing_data_request(Drawing_t *drawing, if(width < 0) return ; if(height < 0) return ; + Tab *tab = drawing->control_flow_data->tab; TimeWindow time_window = lttvwindow_get_time_window(tab); @@ -218,12 +220,12 @@ void drawing_data_request(Drawing_t *drawing, associated by id hooks. */ hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook)); - hooks = g_array_set_size(hooks, 13); + hooks = g_array_set_size(hooks, 16); /* before hooks */ ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_ENTRY, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_ENTRY, LTT_FIELD_SYSCALL_ID, 0, 0, before_execmode_hook, events_request, @@ -231,7 +233,7 @@ void drawing_data_request(Drawing_t *drawing, g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.t, - LTT_FACILITY_KERNEL, LTT_EVENT_SYSCALL_EXIT, + LTT_FACILITY_KERNEL_ARCH, LTT_EVENT_SYSCALL_EXIT, 0, 0, 0, before_execmode_hook, events_request, @@ -270,12 +272,29 @@ void drawing_data_request(Drawing_t *drawing, &g_array_index(hooks, LttvTraceHook, 5)); g_assert(!ret); + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_ENTRY, + LTT_FIELD_SOFT_IRQ_ID, 0, 0, + before_execmode_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 6)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_KERNEL, LTT_EVENT_SOFT_IRQ_EXIT, + 0, 0, 0, + before_execmode_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_SCHEDCHANGE, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, before_schedchange_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 6)); + &g_array_index(hooks, LttvTraceHook, 8)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.t, @@ -283,7 +302,7 @@ void drawing_data_request(Drawing_t *drawing, LTT_FIELD_PID, 0, 0, before_process_exit_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 7)); + &g_array_index(hooks, LttvTraceHook, 9)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.t, @@ -291,7 +310,7 @@ void drawing_data_request(Drawing_t *drawing, LTT_FIELD_PID, 0, 0, before_process_release_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 8)); + &g_array_index(hooks, LttvTraceHook, 10)); g_assert(!ret); @@ -349,7 +368,7 @@ void drawing_data_request(Drawing_t *drawing, LTT_FIELD_OUT, LTT_FIELD_IN, LTT_FIELD_OUT_STATE, after_schedchange_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 9)); + &g_array_index(hooks, LttvTraceHook, 11)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.t, @@ -357,7 +376,7 @@ void drawing_data_request(Drawing_t *drawing, LTT_FIELD_PARENT_PID, LTT_FIELD_CHILD_PID, 0, after_process_fork_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 10)); + &g_array_index(hooks, LttvTraceHook, 12)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.t, @@ -365,7 +384,7 @@ void drawing_data_request(Drawing_t *drawing, LTT_FIELD_PID, 0, 0, after_process_exit_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 11)); + &g_array_index(hooks, LttvTraceHook, 13)); g_assert(!ret); ret = lttv_trace_find_hook(ts->parent.t, @@ -373,7 +392,15 @@ void drawing_data_request(Drawing_t *drawing, 0, 0, 0, after_fs_exec_hook, events_request, - &g_array_index(hooks, LttvTraceHook, 12)); + &g_array_index(hooks, LttvTraceHook, 14)); + g_assert(!ret); + + ret = lttv_trace_find_hook(ts->parent.t, + LTT_FACILITY_STATEDUMP, LTT_EVENT_ENUM_PROCESS_STATE, + LTT_FIELD_PID, LTT_FIELD_PARENT_PID, LTT_FIELD_NAME, + after_event_enum_process_hook, + events_request, + &g_array_index(hooks, LttvTraceHook, 15)); g_assert(!ret); @@ -390,7 +417,7 @@ void drawing_data_request(Drawing_t *drawing, /* Add these hooks to each event_by_id hooks list */ /* add before */ - for(k = 0 ; k < 9 ; k++) { + for(k = 0 ; k < 11 ; k++) { hook = &g_array_index(hooks, LttvTraceHook, k); for(l=0;lfac_list->len;l++) { thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l); @@ -402,7 +429,7 @@ void drawing_data_request(Drawing_t *drawing, } /* add after */ - for(k = 9 ; k < 13 ; k++) { + for(k = 11 ; k < 16 ; k++) { hook = &g_array_index(hooks, LttvTraceHook, k); for(l=0;lfac_list->len;l++) { thf = g_array_index(hook->fac_list, LttvTraceHookByFacility*, l); @@ -571,6 +598,9 @@ void drawing_request_expose(EventsRequest *events_request, x, 0, width, drawing->drawing_area->allocation.height); + /* Update directly when scrolling */ + gdk_window_process_updates(drawing->drawing_area->window, + TRUE); } @@ -624,6 +654,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, drawing->alloc_height = drawing->height + EXTRA_ALLOC; update_pixmap_size(drawing->control_flow_data->process_list, drawing->alloc_width); + update_index_to_pixmap(drawing->control_flow_data->process_list); } //drawing->height = widget->allocation.height; @@ -690,11 +721,12 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) (ControlFlowData*)g_object_get_data( G_OBJECT(widget), "control_flow_data"); +#if 0 if(unlikely(drawing->gc == NULL)) { drawing->gc = gdk_gc_new(drawing->drawing_area->window); gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc); } - +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); LttTime current_time = @@ -714,11 +746,18 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.width, event->area.height); #endif //0 drawing->height = processlist_get_height(control_flow_data->process_list); +#if 0 copy_pixmap_to_screen(control_flow_data->process_list, widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], event->area.x, event->area.y, event->area.width, event->area.height); +#endif //0 + copy_pixmap_to_screen(control_flow_data->process_list, + widget->window, + drawing->gc, + event->area.x, event->area.y, + event->area.width, event->area.height); /* Erase the dotted lines left.. */ @@ -741,7 +780,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) drawing->width, &cursor_x); - +#if 0 if(drawing->dotted_gc == NULL) { drawing->dotted_gc = gdk_gc_new(drawing->drawing_area->window); @@ -758,6 +797,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) dash_list, 2); } +#endif //0 gint height_tot = MAX(widget->allocation.height, drawing->height); gdk_draw_line(widget->window, drawing->dotted_gc, @@ -904,8 +944,6 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) drawing->pango_layout = gtk_widget_create_pango_layout(drawing->drawing_area, NULL); - drawing->dotted_gc = NULL; - drawing->height = 1; drawing->width = 1; drawing->depth = 0; @@ -992,6 +1030,7 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) G_CALLBACK (button_press_event), (gpointer)drawing); + gtk_widget_show(drawing->ruler); gtk_widget_show(drawing->padding); gtk_widget_show(drawing->ruler_hbox); @@ -1008,6 +1047,50 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) gdk_colormap_alloc_colors(colormap, drawing_colors, NUM_COLORS, FALSE, TRUE, success); + drawing->gc = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + drawing->dotted_gc = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + + gdk_gc_copy(drawing->gc, + main_window_get_widget(control_flow_data->tab)->style->black_gc); + gdk_gc_copy(drawing->dotted_gc, + main_window_get_widget(control_flow_data->tab)->style->white_gc); + + gint8 dash_list[] = { 1, 2 }; + gdk_gc_set_line_attributes(drawing->dotted_gc, + 1, + GDK_LINE_ON_OFF_DASH, + GDK_CAP_BUTT, + GDK_JOIN_MITER); + gdk_gc_set_dashes(drawing->dotted_gc, + 0, + dash_list, + 2); + + drawing->ruler_gc_butt = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + gdk_gc_copy(drawing->ruler_gc_butt, + main_window_get_widget(control_flow_data->tab)->style->black_gc); + drawing->ruler_gc_round = + gdk_gc_new(GDK_DRAWABLE(main_window_get_widget(control_flow_data->tab)->window)); + gdk_gc_copy(drawing->ruler_gc_round, + main_window_get_widget(control_flow_data->tab)->style->black_gc); + + + gdk_gc_set_line_attributes(drawing->ruler_gc_butt, + 2, + GDK_LINE_SOLID, + GDK_CAP_BUTT, + GDK_JOIN_MITER); + + gdk_gc_set_line_attributes(drawing->ruler_gc_round, + 2, + GDK_LINE_SOLID, + GDK_CAP_ROUND, + GDK_JOIN_ROUND); + + return drawing; } @@ -1027,8 +1110,11 @@ void drawing_destroy(Drawing_t *drawing) if(drawing->gc != NULL) gdk_gc_unref(drawing->gc); - g_free(drawing->pango_layout); + g_object_unref(drawing->pango_layout); if(drawing->dotted_gc != NULL) gdk_gc_unref(drawing->dotted_gc); + if(drawing->ruler_gc_butt != NULL) gdk_gc_unref(drawing->ruler_gc_butt); + if(drawing->ruler_gc_round != NULL) gdk_gc_unref(drawing->ruler_gc_round); + g_free(drawing); g_info("drawing_destroy end"); } @@ -1271,15 +1357,8 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) event->area.width, event->area.height); - GdkGC *gc = gdk_gc_new(drawing->ruler->window); - gdk_gc_copy(gc, drawing->ruler->style->black_gc); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_BUTT, - GDK_JOIN_MITER); gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_butt, event->area.x, 1, event->area.x + event->area.width, 1); @@ -1301,19 +1380,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) global_width += ink_rect.width; gdk_draw_layout_with_colors(drawing->ruler->window, - gc, + drawing->ruler_gc_butt, 0, 6, layout, &foreground, &background); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_ROUND, - GDK_JOIN_ROUND); - gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_round, 1, 1, 1, 7); @@ -1328,19 +1401,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) if(global_width <= drawing->ruler->allocation.width) { gdk_draw_layout_with_colors(drawing->ruler->window, - gc, + drawing->ruler_gc_butt, drawing->ruler->allocation.width - ink_rect.width, 6, layout, &foreground, &background); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_ROUND, - GDK_JOIN_ROUND); - gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_butt, drawing->ruler->allocation.width-1, 1, drawing->ruler->allocation.width-1, 7); } @@ -1356,19 +1423,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) if(global_width <= drawing->ruler->allocation.width) { gdk_draw_layout_with_colors(drawing->ruler->window, - gc, + drawing->ruler_gc_butt, (drawing->ruler->allocation.width - ink_rect.width)/2, 6, layout, &foreground, &background); - gdk_gc_set_line_attributes(gc, - 2, - GDK_LINE_SOLID, - GDK_CAP_ROUND, - GDK_JOIN_ROUND); - gdk_draw_line (drawing->ruler->window, - gc, + drawing->ruler_gc_butt, drawing->ruler->allocation.width/2, 1, drawing->ruler->allocation.width/2, 7); @@ -1377,7 +1438,6 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) } - gdk_gc_unref(gc); g_object_unref(layout); return FALSE;