X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Fdrawing.c;h=1f4100ee96d5c33d05ef13a8491ce3f172804384;hb=fae7b8ee15af7d3c4eea352cea6f73a1c89a5ac0;hp=e84cdf5ca5aa40e4c53b4b4a659a9d0f0b0fa96b;hpb=dbd243b1b5f764129ae8bcf95432df750bec4a8b;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 e84cdf5c..1f4100ee 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -33,7 +33,10 @@ #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) +//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 */ @@ -51,8 +54,41 @@ 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 +RUN+TRAP +RUN+IRQ +WAIT+foncé +WAIT CPU + WAIT FORK vert foncé ou jaune +IRQ rouge +TRAP: orange +SYSCALL: bleu pâle + +ZOMBIE + WAIT EXIT +*/ + /***************************************************************************** * drawing functions * @@ -79,24 +115,16 @@ 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(drawing->control_flow_data->tab); + lttvwindow_get_time_window(tab); ControlFlowData *control_flow_data = drawing->control_flow_data; - Tab *tab = control_flow_data->tab; // (ControlFlowData*)g_object_get_data( // 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, time_window.start_time.tv_nsec); @@ -110,47 +138,207 @@ void drawing_data_request(Drawing_t *drawing, 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); - - EventsRequest *events_request = g_new(EventsRequest, 1); - // Create the hooks - LttvHooks *event = lttv_hooks_new(); - LttvHooks *before_chunk_traceset = lttv_hooks_new(); - LttvHooks *after_chunk_traceset = lttv_hooks_new(); - LttvHooks *before_request_hook = lttv_hooks_new(); - LttvHooks *after_request_hook = lttv_hooks_new(); - - lttv_hooks_add(before_chunk_traceset, - before_chunk, - events_request, - LTTV_PRIO_DEFAULT); - lttv_hooks_add(after_chunk_traceset, - after_chunk, - events_request, - LTTV_PRIO_DEFAULT); + lttvwindow_events_request_remove_all(tab, + control_flow_data); - lttv_hooks_add(before_request_hook, - before_request, - events_request, - LTTV_PRIO_DEFAULT); + { + /* find the tracehooks */ + LttvTracesetContext *tsc = lttvwindow_get_traceset_context(tab); - lttv_hooks_add(after_request_hook, - after_request, - events_request, - LTTV_PRIO_DEFAULT); + LttvTraceset *traceset = tsc->ts; - /* FIXME : hooks are registered global instead of by ID. - * This is due to the lack of granularity of main window's events requests. - * Should be fixed for gain of performance. - */ + guint i, k, nb_trace; + + LttvTraceState *ts; + + LttvTracefileState *tfs; + + GArray *hooks; + + LttvTraceHook hook; + + LttvAttributeValue val; + + nb_trace = lttv_traceset_number(traceset); + // FIXME : eventually request for more traces + // for(i = 0 ; i < nb_trace ; i++) { + for(i = 0; itraces[i]; + + /* Find the eventtype id for the following events and register the + associated by id hooks. */ + + hooks = g_array_new(FALSE, FALSE, sizeof(LttvTraceHook)); + g_array_set_size(hooks, 16); + + /* 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)); + + 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", + "event_data1", "event_data2", before_process_hook, + &g_array_index(hooks, LttvTraceHook, 7)); + +#if 0 + lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", + NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7)); + + lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL, + NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 8)); +#endif //0 + + /* after hooks */ + + lttv_trace_find_hook(ts->parent.t, "core","syscall_entry","syscall_id", + NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 8)); + + lttv_trace_find_hook(ts->parent.t, "core", "syscall_exit", NULL, NULL, + NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 9)); + + lttv_trace_find_hook(ts->parent.t, "core", "trap_entry", "trap_id", + NULL, NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 10)); + + lttv_trace_find_hook(ts->parent.t, "core", "trap_exit", NULL, NULL, NULL, + after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 11)); + + lttv_trace_find_hook(ts->parent.t, "core", "irq_entry", "irq_id", NULL, + NULL, after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 12)); + + lttv_trace_find_hook(ts->parent.t, "core", "irq_exit", NULL, NULL, NULL, + after_execmode_hook, &g_array_index(hooks, LttvTraceHook, 13)); + + lttv_trace_find_hook(ts->parent.t, "core", "schedchange", "in", "out", + "out_state", after_schedchange_hook, + &g_array_index(hooks, LttvTraceHook, 14)); + + 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)); + +#if 0 + lttv_trace_find_hook(ts->parent.t, "core", "process_fork", "child_pid", + NULL, NULL, process_fork, &g_array_index(hooks, LttvTraceHook, 7)); + + lttv_trace_find_hook(ts->parent.t, "core", "process_exit", NULL, NULL, + NULL, process_exit, &g_array_index(hooks, LttvTraceHook, 8)); +#endif //0 + + + + /* Add these hooks to each event_by_id hooks list */ + /* add before */ + for(k = 0 ; k < hooks->len/2 ; 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); + } + + /* add after */ + for(k = hooks->len/2 ; k < hooks->len ; 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); + } + + events_request->hooks = hooks; + + // Fill the events request + events_request->owner = control_flow_data; + events_request->viewer_data = control_flow_data; + events_request->servicing = FALSE; + events_request->start_time = start; + events_request->start_position = NULL; + events_request->stop_flag = FALSE; + events_request->end_time = time_end; + events_request->num_events = G_MAXUINT; + events_request->end_position = NULL; + events_request->trace = i; /* FIXME */ + events_request->before_chunk_traceset = before_chunk_traceset; + events_request->before_chunk_trace = NULL; + events_request->before_chunk_tracefile = NULL; + events_request->event = NULL; + events_request->event_by_id = event_by_id; + events_request->after_chunk_tracefile = NULL; + events_request->after_chunk_trace = NULL; + events_request->after_chunk_traceset = after_chunk_traceset; + events_request->before_request = before_request_hook; + events_request->after_request = after_request_hook; + + g_debug("req : start : %u, %u", start.tv_sec, + start.tv_nsec); + + g_debug("req : end : %u, %u", time_end.tv_sec, + time_end.tv_nsec); + + lttvwindow_events_request(tab, events_request); + + } + + } + +#if 0 lttv_hooks_add(event, before_schedchange_hook, events_request, @@ -175,37 +363,8 @@ void drawing_data_request(Drawing_t *drawing, after_process_hook, events_request, LTTV_PRIO_STATE+5); +#endif //0 - // Fill the events request - events_request->owner = control_flow_data; - events_request->viewer_data = control_flow_data; - events_request->servicing = FALSE; - events_request->start_time = start; - events_request->start_position = NULL; - events_request->stop_flag = FALSE; - events_request->end_time = time_end; - events_request->num_events = G_MAXUINT; - events_request->end_position = NULL; - events_request->before_chunk_traceset = before_chunk_traceset; - events_request->before_chunk_trace = NULL; - events_request->before_chunk_tracefile = NULL; - events_request->event = event; - events_request->event_by_id = NULL; - events_request->after_chunk_tracefile = NULL; - events_request->after_chunk_trace = NULL; - events_request->after_chunk_traceset = after_chunk_traceset; - events_request->before_request = before_request_hook; - events_request->after_request = after_request_hook; - - g_debug("req : start : %u, %u", start.tv_sec, - start.tv_nsec); - - g_debug("req : end : %u, %u", time_end.tv_sec, - time_end.tv_nsec); - - lttvwindow_events_request_remove_all(tab, - control_flow_data); - lttvwindow_events_request(tab, events_request); } @@ -216,8 +375,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; } @@ -229,16 +395,15 @@ 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); + LttTime end_time = time_window.end_time; + 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); @@ -274,20 +439,18 @@ 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); + LttTime window_end = time_window.end_time; + #if 0 convert_time_to_pixels( - time_window.start_time, - window_end, + time_window, 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); @@ -414,6 +577,10 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) (ControlFlowData*)g_object_get_data( G_OBJECT(widget), "control_flow_data"); + if(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); @@ -422,9 +589,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, @@ -440,8 +605,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); @@ -483,7 +647,7 @@ after_expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data } - +#if 0 void tree_row_activated(GtkTreeModel *treemodel, GtkTreePath *arg1, @@ -498,12 +662,12 @@ tree_row_activated(GtkTreeModel *treemodel, path_indices = gtk_tree_path_get_indices (arg1); - height = get_cell_height( + height = get_cell_height(cfd->process_list, GTK_TREE_VIEW(treeview)); drawing->horizontal_sel = height * path_indices[0]; g_critical("new hor sel : %i", drawing->horizontal_sel); } - +#endif //0 /* mouse click */ static gboolean @@ -522,16 +686,14 @@ 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); + LttTime window_end = time_window.end_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); @@ -710,6 +872,11 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) gtk_widget_show(drawing->scrollbar); gtk_widget_show(drawing->hbox); + /* Allocate the colors */ + GdkColormap* colormap = gdk_colormap_get_system(); + gboolean success[NUM_COLORS]; + gdk_colormap_alloc_colors(colormap, drawing_colors, NUM_COLORS, FALSE, + TRUE, success); return drawing; } @@ -717,6 +884,14 @@ Drawing_t *drawing_construct(ControlFlowData *control_flow_data) void drawing_destroy(Drawing_t *drawing) { g_info("drawing_destroy %p", drawing); + + /* Free the colors */ + GdkColormap* colormap = gdk_colormap_get_system(); + + gdk_colormap_free_colors(colormap, drawing_colors, NUM_COLORS); + + + // Do not unref here, Drawing_t destroyed by it's widget. //g_object_unref( G_OBJECT(drawing->drawing_area)); if(drawing->gc != NULL) @@ -742,46 +917,43 @@ GtkWidget *drawing_get_widget(Drawing_t *drawing) * * Convert from window pixel and time interval to an absolute time. */ -//FIXME : could need ceil and floor versions of this function -void convert_pixels_to_time( +__inline void convert_pixels_to_time( gint width, guint x, - LttTime window_time_begin, - LttTime window_time_end, + TimeWindow time_window, LttTime *time) { - LttTime window_time_interval; + double time_d; - window_time_interval = ltt_time_sub(window_time_end, - window_time_begin); - *time = ltt_time_mul(window_time_interval, (x/(float)width)); - *time = ltt_time_add(window_time_begin, *time); + time_d = time_window.time_width_double; + time_d = time_d / (double)width * (double)x; + *time = ltt_time_from_double(time_d); + *time = ltt_time_add(time_window.start_time, *time); } -//FIXME : could need ceil and floor versions of this function -void convert_time_to_pixels( - LttTime window_time_begin, - LttTime window_time_end, +__inline void convert_time_to_pixels( + TimeWindow time_window, LttTime time, int width, guint *x) { - LttTime window_time_interval; - double interval_double, time_double; - + double time_d; +#ifdef EXTRA_CHECK g_assert(ltt_time_compare(window_time_begin, time) <= 0 && ltt_time_compare(window_time_end, time) >= 0); +#endif //EXTRA_CHECK - window_time_interval = ltt_time_sub(window_time_end,window_time_begin); + time = ltt_time_sub(time, time_window.start_time); - time = ltt_time_sub(time, window_time_begin); + time_d = ltt_time_to_double(time); - /* LttTime to double conversions here should really be under 4000 hours.. */ - interval_double = ltt_time_to_double(window_time_interval); - time_double = ltt_time_to_double(time); - - *x = (guint)(time_double/interval_double * width); + if(time_window.time_width_double == 0.0) { + g_assert(time_d == 0.0); + *x = 0; + } else { + *x = (guint)(time_d / time_window.time_width_double * (double)width); + } } @@ -976,9 +1148,7 @@ expose_ruler( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) 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 =