X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=9030a37b49367ca6a4dcdb996769f4c267acc548;hb=2eef04b5f3234a4e303bd6162eb20d055b7d44cf;hp=fa1c144ef4da90e97ea4e9bff84ed5100c4e09f3;hpb=4b7dc462963cae143ed66dd82a3d88a792f91b61;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 fa1c144e..9030a37b 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -18,6 +18,9 @@ #include #include +#include + +#include #include #include @@ -28,7 +31,6 @@ #include "drawing.h" #include "eventhooks.h" #include "cfv.h" -#include "cfv-private.h" #define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) #define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) @@ -36,7 +38,7 @@ //FIXME #define TRACE_NUMBER 0 - +#if 0 /* colors for two lines representation */ GdkColor drawing_colors[NUM_COLORS] = { /* Pixel, R, G, B */ { 0, 0, 0, 0 }, /* COL_BLACK */ @@ -54,6 +56,27 @@ GdkColor drawing_colors[NUM_COLORS] = { 0, 0xFFFF, 0xFFFF, 0xFFFF } /* COL_MODE_UNKNOWN : white */ }; +#endif //0 + + +GdkColor drawing_colors[NUM_COLORS] = +{ /* Pixel, R, G, B */ + { 0, 0, 0, 0 }, /* COL_BLACK */ + { 0, 0xFFFF, 0xFFFF, 0xFFFF }, /* COL_WHITE */ + { 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, 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 */ + { 0, 0x8900, 0x0000, 0x8400 }, /* COL_EXIT : "less dark" magenta */ + { 0, 0xFFFF, 0xFFFF, 0xFFFF }, /* COL_MODE_UNKNOWN : white */ + { 0, 0xFFFF, 0xFFFF, 0xFFFF } /* COL_UNNAMED : white */ + +}; + /* RUN+USER MODE green RUN+SYSCALL @@ -94,12 +117,6 @@ void drawing_data_request(Drawing_t *drawing, if(width < 0) return ; if(height < 0) return ; - if(drawing->gc == NULL) { - drawing->gc = gdk_gc_new(drawing->drawing_area->window); - gdk_gc_copy(drawing->gc, drawing->drawing_area->style->black_gc); - } - - Tab *tab = drawing->control_flow_data->tab; TimeWindow time_window = lttvwindow_get_time_window(tab); @@ -109,29 +126,28 @@ void drawing_data_request(Drawing_t *drawing, // G_OBJECT(drawing->drawing_area), "control_flow_data"); LttTime start, time_end; - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); + LttTime window_end = time_window.end_time; - g_debug("req : window start_time : %u, %u", time_window.start_time.tv_sec, + g_debug("req : window start_time : %lu, %lu", time_window.start_time.tv_sec, time_window.start_time.tv_nsec); - g_debug("req : window time width : %u, %u", time_window.time_width.tv_sec, + g_debug("req : window time width : %lu, %lu", time_window.time_width.tv_sec, time_window.time_width.tv_nsec); - g_debug("req : window_end : %u, %u", window_end.tv_sec, + g_debug("req : window_end : %lu, %lu", window_end.tv_sec, window_end.tv_nsec); g_debug("x is : %i, x+width is : %i", x, x+width); convert_pixels_to_time(drawing->width, x, - time_window.start_time, - window_end, + time_window, &start); convert_pixels_to_time(drawing->width, x+width, - time_window.start_time, - window_end, + time_window, &time_end); + time_end = ltt_time_add(time_end, ltt_time_one); // because main window + // doesn't deliver end time. lttvwindow_events_request_remove_all(tab, control_flow_data); @@ -152,8 +168,6 @@ void drawing_data_request(Drawing_t *drawing, LttvTraceHook hook; - LttvAttributeValue val; - nb_trace = lttv_traceset_number(traceset); // FIXME : eventually request for more traces // for(i = 0 ; i < nb_trace ; i++) { @@ -195,7 +209,7 @@ void drawing_data_request(Drawing_t *drawing, associated by id hooks. */ hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook)); - g_array_set_size(hooks, 16); + g_array_set_size(hooks, 10); /* before hooks */ @@ -235,31 +249,38 @@ void drawing_data_request(Drawing_t *drawing, /* after hooks */ +#if 0 + /**** DESACTIVATED ****/ lttv_trace_find_hook(ts->parent.t, "core","syscall_entry","syscall_id", NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 8)); - + /**** DESACTIVATED ****/ lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 9)); + /**** DESACTIVATED ****/ lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id", NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 10)); + /**** DESACTIVATED ****/ lttv_trace_find_hook(ts->parent.t, "core", "trap_exit", NULL, NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 11)); + /**** DESACTIVATED ****/ lttv_trace_find_hook(ts->parent.t, "core", "irq_entry", "irq_id", NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 12)); + /**** DESACTIVATED ****/ lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 13)); +#endif //0 lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", "out_state", after_schedchange_hook, - &g_array_index(hooks, LttvTraceHook, 14)); + &g_array_index(hooks, LttvTraceHook, 8)); lttv_trace_find_hook(ts->parent.t, "core", "process", "event_sub_id", "event_data1", "event_data2", after_process_hook, - &g_array_index(hooks, LttvTraceHook, 15)); + &g_array_index(hooks, LttvTraceHook, 9)); #if 0 lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", @@ -273,7 +294,7 @@ void drawing_data_request(Drawing_t *drawing, /* Add these hooks to each event_by_id hooks list */ /* add before */ - for(k = 0 ; k < hooks->len/2 ; k++) { + 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, @@ -282,7 +303,7 @@ void drawing_data_request(Drawing_t *drawing, } /* add after */ - for(k = hooks->len/2 ; k < hooks->len ; k++) { + 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, @@ -314,10 +335,10 @@ void drawing_data_request(Drawing_t *drawing, events_request->before_request = before_request_hook; events_request->after_request = after_request_hook; - g_debug("req : start : %u, %u", start.tv_sec, + g_debug("req : start : %lu, %lu", start.tv_sec, start.tv_nsec); - g_debug("req : end : %u, %u", time_end.tv_sec, + g_debug("req : end : %lu, %lu", time_end.tv_sec, time_end.tv_nsec); lttvwindow_events_request(tab, events_request); @@ -363,8 +384,15 @@ static void set_last_start(gpointer key, gpointer value, gpointer user_data) guint x = (guint)user_data; hashed_process_data->x.over = x; + hashed_process_data->x.over_used = FALSE; + hashed_process_data->x.over_marked = FALSE; hashed_process_data->x.middle = x; + hashed_process_data->x.middle_used = FALSE; + hashed_process_data->x.middle_marked = FALSE; hashed_process_data->x.under = x; + hashed_process_data->x.under_used = FALSE; + hashed_process_data->x.under_marked = FALSE; + hashed_process_data->next_good_time = ltt_time_zero; return; } @@ -376,22 +404,21 @@ void drawing_data_request_begin(EventsRequest *events_request, LttvTracesetState LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss); TimeWindow time_window = lttvwindow_get_time_window(cfd->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + guint width = cfd->drawing->width; guint x=0; cfd->drawing->last_start = events_request->start_time; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, events_request->start_time, width, &x); g_hash_table_foreach(cfd->process_list->process_hash, set_last_start, (gpointer)x); + } void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss) @@ -399,8 +426,13 @@ void drawing_chunk_begin(EventsRequest *events_request, LttvTracesetState *tss) g_debug("Begin of chunk"); ControlFlowData *cfd = events_request->viewer_data; LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss); - LttTime current_time = lttv_traceset_context_get_current_tfc(tsc)->timestamp; + //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); + cfd->process_list->current_hash_data = g_new(HashedProcessData*,num_cpu); + memset(cfd->process_list->current_hash_data, 0, + sizeof(HashedProcessData*)*num_cpu); //cfd->drawing->last_start = LTT_TIME_MIN(current_time, // events_request->end_time); } @@ -413,7 +445,7 @@ void drawing_request_expose(EventsRequest *events_request, gint x, x_end, width; ControlFlowData *cfd = events_request->viewer_data; - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tss); + LttvTracesetContext *tsc = (LttvTracesetContext*)tss; Drawing_t *drawing = cfd->drawing; TimeWindow time_window = @@ -421,39 +453,17 @@ void drawing_request_expose(EventsRequest *events_request, g_debug("request expose"); - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); -#if 0 convert_time_to_pixels( - time_window.start_time, - window_end, - cfd->drawing->last_start, - drawing->width, - &x); - -#endif //0 - convert_time_to_pixels( - time_window.start_time, - window_end, + time_window, end_time, drawing->width, &x_end); x = drawing->damage_begin; - // x_end = drawing->damage_end; + width = x_end - x; drawing->damage_begin = x+width; - //drawing->damage_end = drawing->width; - /* ask for the buffer to be redrawn */ - - //gtk_widget_queue_draw_area ( drawing->drawing_area, - // 0, 0, - // drawing->width, drawing->height); - - /* FIXME - * will need more precise pixel_to_time and time_to_pixel conversion - * functions to redraw only the needed area. */ gtk_widget_queue_draw_area ( drawing->drawing_area, x, 0, width, drawing->height); @@ -561,6 +571,10 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) (ControlFlowData*)g_object_get_data( G_OBJECT(widget), "control_flow_data"); + 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); + } TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -569,9 +583,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) guint cursor_x=0; - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); - + LttTime window_end = time_window.end_time; /* update the screen from the pixmap buffer */ gdk_draw_pixmap(widget->window, @@ -587,8 +599,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) { /* Draw the dotted lines */ convert_time_to_pixels( - time_window.start_time, - window_end, + time_window, current_time, drawing->width, &cursor_x); @@ -669,16 +680,11 @@ button_press_event( GtkWidget *widget, GdkEventButton *event, gpointer user_data { LttTime time; - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); - - /* left mouse button click */ g_debug("x click is : %f", event->x); convert_pixels_to_time(drawing->width, (guint)event->x, - time_window.start_time, - window_end, + time_window, &time); lttvwindow_report_current_time(control_flow_data->tab, time); @@ -898,58 +904,6 @@ GtkWidget *drawing_get_widget(Drawing_t *drawing) return drawing->vbox; } -/* convert_pixels_to_time - * - * Convert from window pixel and time interval to an absolute time. - */ -__inline void convert_pixels_to_time( - gint width, - guint x, - LttTime window_time_begin, - LttTime window_time_end, - LttTime *time) -{ - LttTime window_time_interval; - guint64 time_ll; - - window_time_interval = ltt_time_sub(window_time_end, - window_time_begin); - time_ll = ltt_time_to_uint64(window_time_interval); - time_ll = time_ll * x / width; - *time = ltt_time_from_uint64(time_ll); - *time = ltt_time_add(window_time_begin, *time); -} - - -__inline void convert_time_to_pixels( - LttTime window_time_begin, - LttTime window_time_end, - LttTime time, - int width, - guint *x) -{ - LttTime window_time_interval; - guint64 time_ll, interval_ll; - - g_assert(ltt_time_compare(window_time_begin, time) <= 0 && - ltt_time_compare(window_time_end, time) >= 0); - - window_time_interval = ltt_time_sub(window_time_end,window_time_begin); - - time = ltt_time_sub(time, window_time_begin); - - time_ll = ltt_time_to_uint64(time); - interval_ll = ltt_time_to_uint64(window_time_interval); - - if(interval_ll == 0) { - g_assert(time_ll == 0); - *x = 0; - } else { - *x = (guint)(time_ll * width / interval_ll); - } - -} - void drawing_draw_line( Drawing_t *drawing, GdkPixmap *pixmap, guint x1, guint y1, @@ -1029,12 +983,12 @@ void drawing_insert_square(Drawing_t *drawing, drawing->width+SAFETY, drawing->height - y); - if (drawing->pixmap) + if(likely(drawing->pixmap)) gdk_pixmap_unref(drawing->pixmap); drawing->pixmap = pixmap; - if(drawing->height==1) drawing->height = height; + if(unlikely(drawing->height==1)) drawing->height = height; else drawing->height += height; gtk_widget_set_size_request(drawing->drawing_area, @@ -1056,7 +1010,7 @@ void drawing_remove_square(Drawing_t *drawing, { GdkPixmap *pixmap; - if(drawing->height == height) { + if(unlikely((guint)drawing->height == height)) { pixmap = gdk_pixmap_new( drawing->drawing_area->window, drawing->width + SAFETY, @@ -1090,7 +1044,7 @@ void drawing_remove_square(Drawing_t *drawing, drawing->height-=height; } - if (drawing->pixmap) + if(likely(drawing->pixmap)) gdk_pixmap_unref(drawing->pixmap); drawing->pixmap = pixmap; @@ -1133,17 +1087,13 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) PangoContext *context; PangoLayout *layout; - PangoAttribute *attribute; PangoFontDescription *FontDesc; - gint Font_Size; PangoRectangle ink_rect; - guint global_width=0; + gint global_width=0; GdkColor foreground = { 0, 0, 0, 0 }; GdkColor background = { 0, 0xffff, 0xffff, 0xffff }; - LttTime window_end = - ltt_time_add(time_window.time_width, - time_window.start_time); + LttTime window_end = time_window.end_time; LttTime half_width = ltt_time_div(time_window.time_width,2.0); LttTime window_middle =