X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=8bad3e96edf5a59a908b5ec99979170f001efff5;hb=348c6ba830cba63cc5486e2cea042c8a70cf1fb2;hp=b09853d31f1e93a279971cc5514d1843900a00b7;hpb=08489c1e5921ed99401e387419a9163308e3d5a6;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 b09853d3..8bad3e96 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 */ @@ -111,7 +115,6 @@ motion_notify_ruler(GtkWidget *widget, GdkEventMotion *event, gpointer user_data * erase drawing already present (SAFETY). */ void drawing_data_request(Drawing_t *drawing, - GdkPixmap **pixmap, gint x, gint y, gint width, gint height) @@ -160,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; @@ -168,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 @@ -211,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, 12); /* 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)); @@ -275,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)); @@ -283,6 +343,32 @@ 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); + + #if 0 lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", @@ -296,21 +382,27 @@ 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 < 12 ; 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; @@ -430,7 +522,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, @@ -466,9 +558,10 @@ void drawing_request_expose(EventsRequest *events_request, drawing->damage_begin = x+width; + // FIXME ? gtk_widget_queue_draw_area ( drawing->drawing_area, x, 0, - width, drawing->height); + width, drawing->drawing_area->allocation.height); } @@ -512,15 +605,17 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, drawing->width = widget->allocation.width; if(drawing->alloc_width < widget->allocation.width) { - if(drawing->pixmap) - gdk_pixmap_unref(drawing->pixmap); + //if(drawing->pixmap) + // gdk_pixmap_unref(drawing->pixmap); - drawing->pixmap = gdk_pixmap_new(widget->window, - drawing->width + SAFETY + EXTRA_ALLOC, - drawing->height + EXTRA_ALLOC, - -1); + //drawing->pixmap = gdk_pixmap_new(widget->window, + // drawing->width + SAFETY + EXTRA_ALLOC, + // drawing->height + EXTRA_ALLOC, + // -1); drawing->alloc_width = drawing->width + SAFETY + EXTRA_ALLOC; drawing->alloc_height = drawing->height + EXTRA_ALLOC; + update_pixmap_size(drawing->control_flow_data->process_list, + drawing->alloc_width); } //drawing->height = widget->allocation.height; @@ -529,12 +624,12 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, // Clear the image - gdk_draw_rectangle (drawing->pixmap, - widget->style->black_gc, - TRUE, - 0, 0, - drawing->width+SAFETY, - drawing->height); + //gdk_draw_rectangle (drawing->pixmap, + // widget->style->black_gc, + // TRUE, + // 0, 0, + // drawing->width+SAFETY, + // drawing->height); //g_info("init data request"); @@ -553,10 +648,20 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, drawing->damage_begin = 0; drawing->damage_end = widget->allocation.width; - if(drawing->damage_begin < drawing->damage_end) + if((widget->allocation.width != 1 && + 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->pixmap, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, @@ -592,23 +697,32 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) LttTime window_end = time_window.end_time; /* update the screen from the pixmap buffer */ +#if 0 gdk_draw_pixmap(widget->window, widget->style->fg_gc[GTK_WIDGET_STATE (widget)], drawing->pixmap, event->area.x, event->area.y, 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)], + event->area.x, event->area.y, + event->area.width, event->area.height); + + /* Erase the dotted lines left.. */ if(widget->allocation.height > drawing->height) + { gdk_draw_rectangle (widget->window, drawing->drawing_area->style->black_gc, TRUE, event->area.x, drawing->height, event->area.width, // do not overlap widget->allocation.height - drawing->height); - - + } if(ltt_time_compare(time_window.start_time, current_time) <= 0 && ltt_time_compare(window_end, current_time) >= 0) { @@ -636,11 +750,11 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) dash_list, 2); } - - drawing_draw_line(NULL, widget->window, + 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, - drawing->dotted_gc); + cursor_x, height_tot); } return FALSE; } @@ -823,7 +937,7 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) // drawing->height, // drawing->depth); - drawing->pixmap = NULL; + //drawing->pixmap = NULL; // drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window, // drawing->drawing_area->allocation.width, @@ -906,7 +1020,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"); } @@ -934,30 +1048,37 @@ void drawing_draw_line( Drawing_t *drawing, void drawing_clear(Drawing_t *drawing) { - if (drawing->pixmap) - gdk_pixmap_unref(drawing->pixmap); + //if (drawing->pixmap) + // gdk_pixmap_unref(drawing->pixmap); + ControlFlowData *cfd = drawing->control_flow_data; - drawing->height = 1; + + rectangle_pixmap(cfd->process_list, + drawing->drawing_area->style->black_gc, + TRUE, + 0, 0, + drawing->alloc_width, // do not overlap + -1); + + //drawing->height = 1; /* Allocate a new pixmap with new height */ - drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window, - drawing->width + SAFETY + EXTRA_ALLOC, - drawing->height + EXTRA_ALLOC, - -1); - drawing->alloc_width = drawing->width + SAFETY + EXTRA_ALLOC; - drawing->alloc_height = drawing->height + EXTRA_ALLOC; - - gtk_widget_set_size_request(drawing->drawing_area, - -1, - drawing->height); - gtk_widget_queue_resize_no_redraw(drawing->drawing_area); + //drawing->pixmap = gdk_pixmap_new(drawing->drawing_area->window, + // drawing->width + SAFETY + EXTRA_ALLOC, + // drawing->height + EXTRA_ALLOC, + // -1); + //drawing->alloc_width = drawing->width + SAFETY + EXTRA_ALLOC; + //drawing->alloc_height = drawing->height + EXTRA_ALLOC; + + //gtk_widget_set_size_request(drawing->drawing_area, + // -1, + // drawing->height); + //gtk_widget_queue_resize_no_redraw(drawing->drawing_area); /* ask for the buffer to be redrawn */ - gtk_widget_queue_draw_area ( drawing->drawing_area, - 0, 0, - drawing->width, drawing->height); + gtk_widget_queue_draw ( drawing->drawing_area); } - +#if 0 /* Insert a square corresponding to a new process in the list */ /* Applies to whole drawing->width */ void drawing_insert_square(Drawing_t *drawing, @@ -980,7 +1101,7 @@ void drawing_insert_square(Drawing_t *drawing, reallocate = TRUE; /* Copy the high region */ - gdk_draw_drawable (new_pixmap, + gdk_draw_pixmap (new_pixmap, drawing->drawing_area->style->black_gc, drawing->pixmap, 0, 0, @@ -1005,7 +1126,7 @@ void drawing_insert_square(Drawing_t *drawing, height); /* copy the bottom of the region */ - gdk_draw_drawable (new_pixmap, + gdk_draw_pixmap (new_pixmap, drawing->drawing_area->style->black_gc, drawing->pixmap, 0, y, @@ -1059,7 +1180,7 @@ void drawing_remove_square(Drawing_t *drawing, pixmap = drawing->pixmap; /* Copy the high region */ - gdk_draw_drawable (pixmap, + gdk_draw_pixmap (pixmap, drawing->drawing_area->style->black_gc, drawing->pixmap, 0, 0, @@ -1067,7 +1188,7 @@ void drawing_remove_square(Drawing_t *drawing, drawing->width + SAFETY, y); /* Copy up the bottom of the region */ - gdk_draw_drawable (pixmap, + gdk_draw_pixmap (pixmap, drawing->drawing_area->style->black_gc, drawing->pixmap, 0, y + height, @@ -1091,6 +1212,7 @@ void drawing_remove_square(Drawing_t *drawing, 0, y, drawing->width, MAX(drawing->height-y, 1)); } +#endif //0 void drawing_update_ruler(Drawing_t *drawing, TimeWindow *time_window) {