X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FDrawing.c;h=e89c8b295b6896125f35c4eb4f4a15d00c803a54;hb=f66eba62898bf525692d55ef95935266aee56096;hp=cb2d049d440e828579c7bb97c7ce00b5062cc054;hpb=f7afe191fd58f0bf4bab9c9514c261535b99d32b;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c index cb2d049d..e89c8b29 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Drawing.c @@ -1,10 +1,19 @@ -#include "Drawing.h" -#include "CFV.h" #include #include #include +#include +#include + +#include "Drawing.h" +#include "CFV.h" +#include "CFV-private.h" +#include "Event_Hooks.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) + /***************************************************************************** * Drawing functions * @@ -32,27 +41,40 @@ static GdkColor CF_Colors [] = }; -//struct _Drawing_t { -// GtkWidget *Drawing_Area_V; -// GdkPixmap *Pixmap; -// ControlFlowData *Control_Flow_Data; - -// gint height, width, depth; - -//}; - /* Function responsible for updating the exposed area. * It must call processTrace() to ask for this update. */ -void Drawing_Data_Request(Drawing_t *Drawing, +void drawing_data_request(Drawing_t *Drawing, GdkPixmap **Pixmap, gint x, gint y, - gint width, + gint width, gint height) { if(width < 0) return ; if(height < 0) return ; - + ControlFlowData *control_flow_data = + (ControlFlowData*)g_object_get_data( + G_OBJECT( + Drawing->Drawing_Area_V), + "Control_Flow_Data"); + + LttTime start, end; + LttTime window_end = ltt_time_add(control_flow_data->Time_Window.time_width, + control_flow_data->Time_Window.start_time); + + convert_pixels_to_time(Drawing, x, + &control_flow_data->Time_Window.start_time, + &window_end, + &start); + + convert_pixels_to_time(Drawing, x + width, + &control_flow_data->Time_Window.start_time, + &window_end, + &end); + + LttvTracesetContext * tsc = + get_traceset_context(control_flow_data->Parent_Window); + gdk_draw_rectangle (*Pixmap, Drawing->Drawing_Area_V->style->white_gc, TRUE, @@ -61,12 +83,30 @@ void Drawing_Data_Request(Drawing_t *Drawing, height); send_test_process( - GuiControlFlow_get_Process_List(Drawing->Control_Flow_Data), + guicontrolflow_get_process_list(Drawing->Control_Flow_Data), Drawing); - send_test_drawing( - GuiControlFlow_get_Process_List(Drawing->Control_Flow_Data), - Drawing, *Pixmap, x, y, width, height); + //send_test_drawing( + //guicontrolflow_get_process_list(Drawing->Control_Flow_Data), + //Drawing, *Pixmap, x, y, width, height); + // Let's call processTrace() !! + EventRequest event_request; // Variable freed at the end of the function. + event_request.Control_Flow_Data = control_flow_data; + event_request.time_begin = start; + event_request.time_end = end; + + LttvHooks *event = lttv_hooks_new(); + lttv_hooks_add(event, draw_event_hook, &event_request); + + lttv_process_traceset_seek_time(tsc, start); + lttv_traceset_context_add_hooks(tsc, + NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, event, NULL); + lttv_process_traceset(tsc, end, G_MAXULONG); + lttv_traceset_context_remove_hooks(tsc, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, event, NULL); + + lttv_hooks_destroy(event); } /* Callbacks */ @@ -101,7 +141,7 @@ configure_event( GtkWidget *widget, GdkEventConfigure *event, Drawing->height = widget->allocation.height; g_critical("init data"); /* Initial data request */ - Drawing_Data_Request(Drawing, &Drawing->Pixmap, 0, 0, + drawing_data_request(Drawing, &Drawing->Pixmap, 0, 0, widget->allocation.width, widget->allocation.height); @@ -124,10 +164,10 @@ g_critical("init data"); /* Request data for missing space */ g_critical("missing data"); - Drawing_Data_Request(Drawing, &Pixmap, Drawing->width, 0, + drawing_data_request(Drawing, &Pixmap, Drawing->width, 0, widget->allocation.width - Drawing->width, widget->allocation.height); - Drawing_Data_Request(Drawing, &Pixmap, 0, Drawing->height, + drawing_data_request(Drawing, &Pixmap, 0, Drawing->height, Drawing->width, widget->allocation.height - Drawing->height); @@ -147,7 +187,6 @@ g_critical("missing data"); // widget->allocation.height - // Drawing->height); - if (Drawing->Pixmap) @@ -178,7 +217,7 @@ expose_event( GtkWidget *widget, GdkEventExpose *event, gpointer user_data ) return FALSE; } -Drawing_t *Drawing_construct(ControlFlowData *Control_Flow_Data) +Drawing_t *drawing_construct(ControlFlowData *Control_Flow_Data) { Drawing_t *Drawing = g_new(Drawing_t, 1); @@ -190,7 +229,7 @@ Drawing_t *Drawing_construct(ControlFlowData *Control_Flow_Data) G_OBJECT(Drawing->Drawing_Area_V), "Link_Drawing_Data", Drawing, - (GDestroyNotify)Drawing_destroy); + (GDestroyNotify)drawing_destroy); //gtk_widget_modify_bg( Drawing->Drawing_Area_V, // GTK_STATE_NORMAL, @@ -228,7 +267,7 @@ Drawing_t *Drawing_construct(ControlFlowData *Control_Flow_Data) return Drawing; } -void Drawing_destroy(Drawing_t *Drawing) +void drawing_destroy(Drawing_t *Drawing) { // Do not unref here, Drawing_t destroyed by it's widget. @@ -237,16 +276,14 @@ void Drawing_destroy(Drawing_t *Drawing) g_free(Drawing); } -GtkWidget *Drawing_getWidget(Drawing_t *Drawing) +GtkWidget *drawing_get_widget(Drawing_t *Drawing) { return Drawing->Drawing_Area_V; } -/* get_time_from_pixels +/* convert_pixels_to_time * - * Get the time interval from window time and pixels, and pixels requested. This - * function uses TimeMul, which should only be used if the float value is lower - * that 4, and here it's always lower than 1, so it's ok. + * Convert from window pixel and time interval to an absolute time. */ void convert_pixels_to_time( Drawing_t *Drawing, @@ -257,13 +294,10 @@ void convert_pixels_to_time( { LttTime window_time_interval; - TimeSub(window_time_interval, *window_time_end, *window_time_begin); - - - TimeMul(*time, window_time_interval, - (x/(float)Drawing->width)); - TimeAdd(*time, *window_time_begin, *time); - + window_time_interval = ltt_time_sub(*window_time_end, + *window_time_begin); + *time = ltt_time_mul(window_time_interval, (x/(float)Drawing->width)); + *time = ltt_time_add(*window_time_begin, *time); } @@ -278,23 +312,22 @@ void convert_time_to_pixels( LttTime window_time_interval; float interval_float, time_float; - TimeSub(window_time_interval, window_time_end, window_time_begin); + window_time_interval = ltt_time_sub(window_time_end,window_time_begin); - TimeSub(time, time, window_time_begin); + time = ltt_time_sub(time, window_time_begin); - interval_float = (window_time_interval.tv_sec * NANSECOND_CONST) - + window_time_interval.tv_nsec; - time_float = (time.tv_sec * NANSECOND_CONST) - + time.tv_nsec; + interval_float = ltt_time_to_double(window_time_interval); + time_float = ltt_time_to_double(time); *x = (guint)(time_float/interval_float * Drawing->width); } -void Drawing_Refresh ( Drawing_t *Drawing, +void drawing_refresh ( Drawing_t *Drawing, guint x, guint y, guint width, guint height) { + g_info("Drawing.c : drawing_refresh %u, %u, %u, %u", x, y, width, height); GdkRectangle update_rect; gdk_draw_drawable( @@ -315,7 +348,7 @@ void Drawing_Refresh ( Drawing_t *Drawing, } -void Drawing_draw_line( Drawing_t *Drawing, +void drawing_draw_line( Drawing_t *Drawing, GdkPixmap *Pixmap, guint x1, guint y1, guint x2, guint y2, @@ -329,7 +362,7 @@ void Drawing_draw_line( Drawing_t *Drawing, -void Drawing_Resize(Drawing_t *Drawing, guint h, guint w) +void drawing_resize(Drawing_t *Drawing, guint h, guint w) { Drawing->height = h ; Drawing->width = w ; @@ -344,7 +377,7 @@ void Drawing_Resize(Drawing_t *Drawing, guint h, guint w) /* Insert a square corresponding to a new process in the list */ /* Applies to whole Drawing->width */ -void Drawing_Insert_Square(Drawing_t *Drawing, +void drawing_insert_square(Drawing_t *Drawing, guint y, guint height) { @@ -405,7 +438,7 @@ void Drawing_Insert_Square(Drawing_t *Drawing, /* Remove a square corresponding to a removed process in the list */ -void Drawing_Remove_Square(Drawing_t *Drawing, +void drawing_remove_square(Drawing_t *Drawing, guint y, guint height) { @@ -451,3 +484,5 @@ void Drawing_Remove_Square(Drawing_t *Drawing, update_rect.height = Drawing->height - y ; gtk_widget_draw( Drawing->Drawing_Area_V, &update_rect); } + +