X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=6b6870eac9f288f87980e531b5aa88c58c1c21fd;hb=80a52ff84b0196d969d8e4bffe0f698652d8801c;hp=e04a72b05aff075733728482819b0e64ba5ec96f;hpb=1a31868cb394a6b2214965baee974fa3cea927f3;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c index e04a72b0..6b6870ea 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -10,11 +10,16 @@ #include #include #include +#include //#include +#include + #include #include +#include + #include "Event_Hooks.h" #include "CFV.h" @@ -22,65 +27,12 @@ #include "Drawing.h" #include "CFV-private.h" + #define MAX_PATH_LEN 256 //FIXME : remove this include when tests finished. -#include "Draw_Item.h" #include -struct _DrawContext { - GdkDrawable *drawable; - GdkGC *gc; - - - DrawInfo *Current; - DrawInfo *Previous; -}; - -struct _DrawInfo { - ItemInfo *over; - ItemInfo *middle; - ItemInfo *under; - - ItemInfo *modify_over; - ItemInfo *modify_middle; - ItemInfo *modify_under; -}; - -/* LttvExecutionState is accessible through the LttvTracefileState. Is has - * a pointer to the LttvProcessState which points to the top of stack - * execution state : LttvExecutionState *state. - * - * LttvExecutionState contains (useful here): - * LttvExecutionMode t, - * LttvExecutionSubmode n, - * LttvProcessStatus s - * - * - * LttvTraceState will be used in the case we need the string of the - * different processes, eventtype_names, syscall_names, trap_names, irq_names. - * - * LttvTracefileState also gives the cpu_name and, as it herits from - * LttvTracefileContext, it gives the LttEvent structure, which is needed - * to get facility name and event name. - */ -struct _ItemInfo { - gint x, y; - LttvTraceState *ts; - LttvTracefileState *tfs; -}; - - - -struct _PropertiesIcon { - gchar *icon_name; - gint width; - gint height; - RelPos position; -}; - - - void test_draw_item(Drawing_t *Drawing, GdkPixmap *Pixmap) { @@ -90,16 +42,14 @@ void test_draw_item(Drawing_t *Drawing, DrawInfo current, previous; ItemInfo over, middle, under, modify_over, modify_middle, modify_under; - int i,j; + int i=0,j=0; - for(i=0; i<1024;i=i+15) + //for(i=0; i<1024;i=i+15) { - for(j=0;j<768;j=j+15) + // for(j=0;j<768;j=j+15) { over.x = i; over.y = j; - over.ts = NULL; - over.tfs = NULL; current.modify_over = &over; @@ -116,20 +66,21 @@ void test_draw_item(Drawing_t *Drawing, properties_icon.width = -1; properties_icon.height = -1; properties_icon.position = OVER; - draw_icon(&properties_icon, &draw_context); + g_free(properties_icon.icon_name); } } } +#ifdef NOTUSE /* NOTE : no drawing data should be sent there, since the drawing widget * has not been initialized */ void send_test_drawing(ProcessList *Process_List, Drawing_t *Drawing, GdkPixmap *Pixmap, gint x, gint y, // y not used here? - gint width, + gint width, gint height) // height won't be used here ? { int i,j; @@ -142,13 +93,13 @@ void send_test_drawing(ProcessList *Process_List, gint Font_Size; //icon - GdkBitmap *mask = g_new(GdkBitmap, 1); - GdkPixmap *icon_pixmap = g_new(GdkPixmap, 1); - GdkGC * gc = gdk_gc_new(Pixmap); - + //GdkBitmap *mask = g_new(GdkBitmap, 1); + //GdkPixmap *icon_pixmap = g_new(GdkPixmap, 1); + GdkGC * gc; // rectangle GdkColor color = { 0, 0xffff, 0x0000, 0x0000 }; + gc = gdk_gc_new(Pixmap); /* Sent text data */ layout = gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, NULL); @@ -288,7 +239,7 @@ void send_test_drawing(ProcessList *Process_List, // } // } - + test_draw_item(Drawing,Pixmap); //gdk_gc_set_clip_origin(Drawing->Drawing_Area_V->style->black_gc, 0, 0); @@ -303,9 +254,8 @@ void send_test_drawing(ProcessList *Process_List, pango_font_description_set_size(FontDesc, Font_Size); + g_object_unref(layout); g_free(gc); - g_free(layout); - //g_free(context); } void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) @@ -451,7 +401,7 @@ void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) Process_List->Test_Process_Sent = TRUE; } - +#endif//NOTUSE /** @@ -469,12 +419,24 @@ h_guicontrolflow(MainWindow *pmParentWindow, LttvTracesetSelector * s, char * ke ControlFlowData *Control_Flow_Data = guicontrolflow() ; Control_Flow_Data->Parent_Window = pmParentWindow; + TimeWindow *time_window = guicontrolflow_get_time_window(Control_Flow_Data); + time_window->start_time.tv_sec = 0; + time_window->start_time.tv_nsec = 0; + time_window->time_width.tv_sec = 0; + time_window->time_width.tv_nsec = 0; + LttTime *current_time = guicontrolflow_get_current_time(Control_Flow_Data); + current_time->tv_sec = 0; + current_time->tv_nsec = 0; + + //g_critical("time width1 : %u",time_window->time_width); + get_time_window(pmParentWindow, - guicontrolflow_get_time_window(Control_Flow_Data)); + time_window); get_current_time(pmParentWindow, - guicontrolflow_get_current_time(Control_Flow_Data)); + current_time); + //g_critical("time width2 : %u",time_window->time_width); // Unreg done in the GuiControlFlow_Destructor reg_update_time_window(update_time_window_hook, Control_Flow_Data, pmParentWindow); @@ -498,16 +460,15 @@ int event_selected_hook(void *hook_data, void *call_data) } -#ifdef DEBUG /* Hook called before drawing. Gets the initial context at the beginning of the * drawing interval and copy it to the context in Event_Request. */ int draw_before_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; - EventsContext Events_Context = (EventsContext*)call_data; + //EventsContext Events_Context = (EventsContext*)call_data; - Event_Request->Events_Context = Events_Context; + //Event_Request->Events_Context = Events_Context; return 0; } @@ -535,7 +496,103 @@ int draw_before_hook(void *hook_data, void *call_data) int draw_event_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; + ControlFlowData *control_flow_data = Event_Request->Control_Flow_Data; + //static int i=0; + + //i++; + //g_critical("%i", i); + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + + LttvTracefileState *tfs = (LttvTracefileState *)call_data; + + LttEvent *e; + e = tfc->e; + + /* Temp dump */ +#ifdef DONTSHOW + GString *string = g_string_new("");; + gboolean field_names = TRUE, state = TRUE; + + lttv_event_to_string(e, tfc->tf, string, TRUE, field_names, tfs); + g_string_append_printf(string,"\n"); + + if(state) { + g_string_append_printf(string, " %s", + g_quark_to_string(tfs->process->state->s)); + } + + g_info("%s",string->str); + + g_string_free(string, TRUE); + + /* End of text dump */ +#endif //DONTSHOW + /* Add process to process list (if not present) and get drawing "y" from + * process position */ + guint pid = tfs->process->pid; + LttTime birth = tfs->process->creation_time; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *Hashed_Process_Data = NULL; + + ProcessList *process_list = + guicontrolflow_get_process_list(Event_Request->Control_Flow_Data); + if(processlist_get_process_pixels(process_list, + pid, + &birth, + &y, + &height, + &Hashed_Process_Data) == 1) + { + /* Process not present */ + processlist_add(process_list, + pid, + &birth, + &pl_height, + &Hashed_Process_Data); + drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y, height); + } + + /* Find pixels corresponding to time of the event. If the time does + * not fit in the window, show a warning, not supposed to happend. */ + guint x = 0; + guint width = control_flow_data->Drawing->Drawing_Area_V->allocation.width; + + LttTime time = ltt_event_time(e); + + LttTime window_end = ltt_time_add(control_flow_data->Time_Window.time_width, + control_flow_data->Time_Window.start_time); + + + convert_time_to_pixels( + control_flow_data->Time_Window.start_time, + window_end, + time, + width, + &x); + + assert(x <= width); + + /* Finally, draw what represents the event. */ + + GdkColor color = { 0, 0xffff, 0x0000, 0x0000 }; + PropertiesArc prop_arc; + prop_arc.color = &color; + prop_arc.size = 10; + prop_arc.filled = TRUE; + prop_arc.position = OVER; + DrawContext *draw_context = Hashed_Process_Data->draw_context; + draw_context->Current->modify_over->x = x; + g_critical("x should be %i", x); + draw_context->Current->modify_over->y = y; + g_critical("y should be %i", y); + draw_context->drawable = control_flow_data->Drawing->Pixmap; + GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V; + //draw_context->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; + draw_context->gc = widget->style->black_gc; + + draw_arc((void*)&prop_arc, (void*)draw_context); + //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap); return 0; } @@ -547,7 +604,6 @@ int draw_after_hook(void *hook_data, void *call_data) g_free(Event_Request); return 0; } -#endif