X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=8f975efaf285e65a1a164570ee7e61cabbbd1d48;hb=e8814eec2e5ba7e735892c3a7d03ff1872f9a0d2;hp=4f54350813f349ff54e4c950ae7d7fab400710fa;hpb=cb1686f66c65661d5e252c40e8537d7cb8a75c72;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 4f543508..8f975efa 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -3,15 +3,26 @@ *****************************************************************************/ +#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) + //#define PANGO_ENABLE_BACKEND #include #include #include +#include +#include //#include +#include +#include +#include + #include #include +#include + #include "Event_Hooks.h" #include "CFV.h" @@ -20,277 +31,7 @@ #include "CFV-private.h" -/* NOTE : no drawing data should be sent there, as 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 height) // height won't be used here ? -{ - int i; - ProcessInfo Process_Info = {10000, 12000, 55600}; - //ProcessInfo Process_Info = {156, 14000, 55500}; - GtkTreeRowReference *got_RowRef; - PangoContext *context; - PangoLayout *layout; - PangoFontDescription *FontDesc;// = pango_font_description_new(); - gint Font_Size; - - /* Sent text data */ - layout = gtk_widget_create_pango_layout(Drawing->Drawing_Area_V, - NULL); - context = pango_layout_get_context(layout); - FontDesc = pango_context_get_font_description(context); - Font_Size = pango_font_description_get_size(FontDesc); - pango_font_description_set_size(FontDesc, Font_Size-3*PANGO_SCALE); - - - - - LttTime birth; - birth.tv_sec = 12000; - birth.tv_nsec = 55500; - g_critical("we have : x : %u, y : %u, width : %u, height : %u", x, y, width, height); - processlist_get_process_pixels(Process_List, - 1, - &birth, - &y, - &height); - - g_critical("we draw : x : %u, y : %u, width : %u, height : %u", x, y, width, height); - drawing_draw_line( - Drawing, Pixmap, x, - y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); - - pango_layout_set_text(layout, "Test", -1); - gdk_draw_layout(Pixmap, Drawing->Drawing_Area_V->style->black_gc, - 0, y+height, layout); - - birth.tv_sec = 14000; - birth.tv_nsec = 55500; - - processlist_get_process_pixels(Process_List, - 156, - &birth, - &y, - &height); - - - drawing_draw_line( - Drawing, Pixmap, x, - y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); - - g_critical("y : %u, height : %u", y, height); - - birth.tv_sec = 12000; - birth.tv_nsec = 55700; - - processlist_get_process_pixels(Process_List, - 10, - &birth, - &y, - &height); - - - drawing_draw_line( - Drawing, Pixmap, x, - y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); - - g_critical("y : %u, height : %u", y, height); - - for(i=0; i<10; i++) - { - birth.tv_sec = i*12000; - birth.tv_nsec = i*55700; - - processlist_get_process_pixels(Process_List, - i, - &birth, - &y, - &height); - - - drawing_draw_line( - Drawing, Pixmap, x, - y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); - - g_critical("y : %u, height : %u", y, height); - - } - - birth.tv_sec = 12000; - birth.tv_nsec = 55600; - - processlist_get_process_pixels(Process_List, - 10, - &birth, - &y, - &height); - - - drawing_draw_line( - Drawing, Pixmap, x, - y+(height/2), x + width, y+(height/2), - Drawing->Drawing_Area_V->style->black_gc); - - g_critical("y : %u, height : %u", y, height); - - - pango_font_description_set_size(FontDesc, Font_Size); - g_free(layout); - //g_free(context); -} - -void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) -{ - guint height, y; - int i; - ProcessInfo Process_Info = {10000, 12000, 55600}; - //ProcessInfo Process_Info = {156, 14000, 55500}; - GtkTreeRowReference *got_RowRef; - - LttTime birth; - - if(Process_List->Test_Process_Sent) return; - - birth.tv_sec = 12000; - birth.tv_nsec = 55500; - - processlist_add(Process_List, - 1, - &birth, - &y); - processlist_get_process_pixels(Process_List, - 1, - &birth, - &y, - &height); - drawing_insert_square( Drawing, y, height); - - //g_critical("y : %u, height : %u", y, height); - - birth.tv_sec = 14000; - birth.tv_nsec = 55500; - - processlist_add(Process_List, - 156, - &birth, - &y); - processlist_get_process_pixels(Process_List, - 156, - &birth, - &y, - &height); - drawing_insert_square( Drawing, y, height); - - //g_critical("y : %u, height : %u", y, height); - - birth.tv_sec = 12000; - birth.tv_nsec = 55700; - - processlist_add(Process_List, - 10, - &birth, - &height); - processlist_get_process_pixels(Process_List, - 10, - &birth, - &y, - &height); - drawing_insert_square( Drawing, y, height); - - //g_critical("y : %u, height : %u", y, height); - - //drawing_insert_square( Drawing, height, 5); - - for(i=0; i<10; i++) - { - birth.tv_sec = i*12000; - birth.tv_nsec = i*55700; - - processlist_add(Process_List, - i, - &birth, - &height); - processlist_get_process_pixels(Process_List, - i, - &birth, - &y, - &height); - drawing_insert_square( Drawing, y, height); - - // g_critical("y : %u, height : %u", y, height); - - } - //g_critical("height : %u", height); - - birth.tv_sec = 12000; - birth.tv_nsec = 55600; - - processlist_add(Process_List, - 10, - &birth, - &y); - processlist_get_process_pixels(Process_List, - 10, - &birth, - &y, - &height); - drawing_insert_square( Drawing, y, height); - - //g_critical("y : %u, height : %u", y, height); - - processlist_add(Process_List, - 10000, - &birth, - &height); - processlist_get_process_pixels(Process_List, - 10000, - &birth, - &y, - &height); - drawing_insert_square( Drawing, y, height); - - //g_critical("y : %u, height : %u", y, height); - - //drawing_insert_square( Drawing, height, 5); - //g_critical("height : %u", height); - - - processlist_get_process_pixels(Process_List, - 10000, - &birth, - &y, &height); - processlist_remove( Process_List, - 10000, - &birth); - - drawing_remove_square( Drawing, y, height); - - if(got_RowRef = - (GtkTreeRowReference*)g_hash_table_lookup( - Process_List->Process_Hash, - &Process_Info)) - { - g_critical("key found"); - g_critical("position in the list : %s", - gtk_tree_path_to_string ( - gtk_tree_row_reference_get_path( - (GtkTreeRowReference*)got_RowRef) - )); - - } - - Process_List->Test_Process_Sent = TRUE; - -} - +#define MAX_PATH_LEN 256 /** @@ -304,14 +45,28 @@ void send_test_process(ProcessList *Process_List, Drawing_t *Drawing) GtkWidget * h_guicontrolflow(MainWindow *pmParentWindow, LttvTracesetSelector * s, char * key) { - g_critical("hGuiControlFlow"); + g_info("h_guicontrolflow, %p, %p, %s", pmParentWindow, s, key); 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); @@ -335,16 +90,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; } @@ -372,53 +126,635 @@ 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; + + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + + LttvTracefileState *tfs = (LttvTracefileState *)call_data; + + LttEvent *e; + e = tfc->e; + + if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) + { + g_critical("schedchange!"); + + /* Add process to process list (if not present) and get drawing "y" from + * process position */ + guint pid_out, pid_in; + LttvProcessState *process_out, *process_in; + LttTime birth; + guint y_in = 0, y_out = 0, height = 0, pl_height = 0; + + ProcessList *process_list = + guicontrolflow_get_process_list(Event_Request->Control_Flow_Data); + + + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + pid_out = ltt_event_get_long_unsigned(e,element); + element = ltt_field_member(f,1); + pid_in = ltt_event_get_long_unsigned(e,element); + g_critical("out : %u in : %u", pid_out, pid_in); + + + /* Find process pid_out in the list... */ + process_out = lttv_state_find_process(tfs, pid_out); + g_critical("out : %s",g_quark_to_string(process_out->state->s)); + + birth = process_out->creation_time; + gchar *name = strdup(g_quark_to_string(process_out->name)); + HashedProcessData *Hashed_Process_Data_out = NULL; + + if(processlist_get_process_pixels(process_list, + pid_out, + &birth, + &y_out, + &height, + &Hashed_Process_Data_out) == 1) + { + /* Process not present */ + processlist_add(process_list, + pid_out, + &birth, + name, + &pl_height, + &Hashed_Process_Data_out); + processlist_get_process_pixels(process_list, + pid_out, + &birth, + &y_out, + &height, + &Hashed_Process_Data_out); + drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_out, height); + } + + g_free(name); + + /* Find process pid_in in the list... */ + process_in = lttv_state_find_process(tfs, pid_in); + g_critical("in : %s",g_quark_to_string(process_in->state->s)); + + birth = process_in->creation_time; + name = strdup(g_quark_to_string(process_in->name)); + HashedProcessData *Hashed_Process_Data_in = NULL; + + if(processlist_get_process_pixels(process_list, + pid_in, + &birth, + &y_in, + &height, + &Hashed_Process_Data_in) == 1) + { + /* Process not present */ + processlist_add(process_list, + pid_in, + &birth, + name, + &pl_height, + &Hashed_Process_Data_in); + processlist_get_process_pixels(process_list, + pid_in, + &birth, + &y_in, + &height, + &Hashed_Process_Data_in); + + drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_in, height); + } + g_free(name); + + + /* 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); + + /* draw what represents the event for outgoing process. */ + + DrawContext *draw_context_out = Hashed_Process_Data_out->draw_context; + draw_context_out->Current->modify_over->x = x; + draw_context_out->Current->modify_over->y = y_out; + draw_context_out->drawable = control_flow_data->Drawing->Pixmap; + draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout; + GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V; + //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; + draw_context_out->gc = widget->style->black_gc; + + //draw_arc((void*)&prop_arc, (void*)draw_context_out); + //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap); + + GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; + GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff }; + PropertiesText prop_text_out; + prop_text_out.foreground = &colorfg_out; + prop_text_out.background = &colorbg_out; + prop_text_out.size = 10; + prop_text_out.position = OVER; + + /* Print status of the process : U, WF, WC, E, W, R */ + if(process_out->state->s == LTTV_STATE_UNNAMED) + prop_text_out.Text = "U"; + else if(process_out->state->s == LTTV_STATE_WAIT_FORK) + prop_text_out.Text = "WF"; + else if(process_out->state->s == LTTV_STATE_WAIT_CPU) + prop_text_out.Text = "WC"; + else if(process_out->state->s == LTTV_STATE_EXIT) + prop_text_out.Text = "E"; + else if(process_out->state->s == LTTV_STATE_WAIT) + prop_text_out.Text = "W"; + else if(process_out->state->s == LTTV_STATE_RUN) + prop_text_out.Text = "R"; + else + prop_text_out.Text = "U"; + + draw_text((void*)&prop_text_out, (void*)draw_context_out); + + /* Finally, update the drawing context of the pid_in. */ + + DrawContext *draw_context_in = Hashed_Process_Data_in->draw_context; + draw_context_in->Current->modify_over->x = x; + draw_context_in->Current->modify_over->y = y_in; + draw_context_in->drawable = control_flow_data->Drawing->Pixmap; + draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout; + widget = control_flow_data->Drawing->Drawing_Area_V; + //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; + draw_context_in->gc = widget->style->black_gc; + + //draw_arc((void*)&prop_arc, (void*)draw_context_in); + //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap); + + GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; + GdkColor colorbg_in = { 0, 0xffff, 0xffff, 0xffff }; + PropertiesText prop_text_in; + prop_text_in.foreground = &colorfg_in; + prop_text_in.background = &colorbg_in; + prop_text_in.size = 10; + prop_text_in.position = OVER; + + /* Print status of the process : U, WF, WC, E, W, R */ + if(process_in->state->s == LTTV_STATE_UNNAMED) + prop_text_in.Text = "U"; + else if(process_in->state->s == LTTV_STATE_WAIT_FORK) + prop_text_in.Text = "WF"; + else if(process_in->state->s == LTTV_STATE_WAIT_CPU) + prop_text_in.Text = "WC"; + else if(process_in->state->s == LTTV_STATE_EXIT) + prop_text_in.Text = "E"; + else if(process_in->state->s == LTTV_STATE_WAIT) + prop_text_in.Text = "W"; + else if(process_in->state->s == LTTV_STATE_RUN) + prop_text_in.Text = "R"; + else + prop_text_in.Text = "U"; + + draw_text((void*)&prop_text_in, (void*)draw_context_in); + + } + return 0; + + /* 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 + } int draw_after_hook(void *hook_data, void *call_data) { EventRequest *Event_Request = (EventRequest*)hook_data; + ControlFlowData *control_flow_data = Event_Request->Control_Flow_Data; + + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + + LttvTracefileState *tfs = (LttvTracefileState *)call_data; + - g_free(Event_Request); + LttEvent *e; + e = tfc->e; + + if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) + { + g_critical("schedchange!"); + + /* Add process to process list (if not present) and get drawing "y" from + * process position */ + guint pid_out, pid_in; + LttvProcessState *process_out, *process_in; + LttTime birth; + guint y_in = 0, y_out = 0, height = 0, pl_height = 0; + + ProcessList *process_list = + guicontrolflow_get_process_list(Event_Request->Control_Flow_Data); + + + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + pid_out = ltt_event_get_long_unsigned(e,element); + element = ltt_field_member(f,1); + pid_in = ltt_event_get_long_unsigned(e,element); + g_critical("out : %u in : %u", pid_out, pid_in); + + + /* Find process pid_out in the list... */ + process_out = lttv_state_find_process(tfs, pid_out); + g_critical("out : %s",g_quark_to_string(process_out->state->s)); + + birth = process_out->creation_time; + gchar *name = strdup(g_quark_to_string(process_out->name)); + HashedProcessData *Hashed_Process_Data_out = NULL; + + if(processlist_get_process_pixels(process_list, + pid_out, + &birth, + &y_out, + &height, + &Hashed_Process_Data_out) == 1) + { + /* Process not present */ + processlist_add(process_list, + pid_out, + &birth, + name, + &pl_height, + &Hashed_Process_Data_out); + processlist_get_process_pixels(process_list, + pid_out, + &birth, + &y_out, + &height, + &Hashed_Process_Data_out); + drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_out, height); + } + + g_free(name); + + /* Find process pid_in in the list... */ + process_in = lttv_state_find_process(tfs, pid_in); + g_critical("in : %s",g_quark_to_string(process_in->state->s)); + + birth = process_in->creation_time; + name = strdup(g_quark_to_string(process_in->name)); + HashedProcessData *Hashed_Process_Data_in = NULL; + + if(processlist_get_process_pixels(process_list, + pid_in, + &birth, + &y_in, + &height, + &Hashed_Process_Data_in) == 1) + { + /* Process not present */ + processlist_add(process_list, + pid_in, + &birth, + name, + &pl_height, + &Hashed_Process_Data_in); + processlist_get_process_pixels(process_list, + pid_in, + &birth, + &y_in, + &height, + &Hashed_Process_Data_in); + + drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y_in, height); + } + g_free(name); + + + /* 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); + + /* draw what represents the event for outgoing process. */ + + DrawContext *draw_context_out = Hashed_Process_Data_out->draw_context; + //draw_context_out->Current->modify_over->x = x; + //draw_context_out->Current->modify_over->y = y_out; + draw_context_out->drawable = control_flow_data->Drawing->Pixmap; + draw_context_out->pango_layout = control_flow_data->Drawing->pango_layout; + GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V; + //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; + draw_context_out->gc = widget->style->black_gc; + + //draw_arc((void*)&prop_arc, (void*)draw_context_out); + //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap); + + GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; + GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff }; + PropertiesText prop_text_out; + prop_text_out.foreground = &colorfg_out; + prop_text_out.background = &colorbg_out; + prop_text_out.size = 10; + prop_text_out.position = OVER; + + /* Print status of the process : U, WF, WC, E, W, R */ + if(process_out->state->s == LTTV_STATE_UNNAMED) + prop_text_out.Text = "U"; + else if(process_out->state->s == LTTV_STATE_WAIT_FORK) + prop_text_out.Text = "WF"; + else if(process_out->state->s == LTTV_STATE_WAIT_CPU) + prop_text_out.Text = "WC"; + else if(process_out->state->s == LTTV_STATE_EXIT) + prop_text_out.Text = "E"; + else if(process_out->state->s == LTTV_STATE_WAIT) + prop_text_out.Text = "W"; + else if(process_out->state->s == LTTV_STATE_RUN) + prop_text_out.Text = "R"; + else + prop_text_out.Text = "U"; + + draw_text((void*)&prop_text_out, (void*)draw_context_out); + + /* Finally, update the drawing context of the pid_in. */ + + DrawContext *draw_context_in = Hashed_Process_Data_in->draw_context; + //draw_context_in->Current->modify_over->x = x; + //draw_context_in->Current->modify_over->y = y_in; + draw_context_in->drawable = control_flow_data->Drawing->Pixmap; + draw_context_in->pango_layout = control_flow_data->Drawing->pango_layout; + widget = control_flow_data->Drawing->Drawing_Area_V; + //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; + draw_context_in->gc = widget->style->black_gc; + + //draw_arc((void*)&prop_arc, (void*)draw_context_in); + //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap); + + GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; + GdkColor colorbg_in = { 0, 0xffff, 0xffff, 0xffff }; + PropertiesText prop_text_in; + prop_text_in.foreground = &colorfg_in; + prop_text_in.background = &colorbg_in; + prop_text_in.size = 10; + prop_text_in.position = OVER; + + /* Print status of the process : U, WF, WC, E, W, R */ + if(process_in->state->s == LTTV_STATE_UNNAMED) + prop_text_in.Text = "U"; + else if(process_in->state->s == LTTV_STATE_WAIT_FORK) + prop_text_in.Text = "WF"; + else if(process_in->state->s == LTTV_STATE_WAIT_CPU) + prop_text_in.Text = "WC"; + else if(process_in->state->s == LTTV_STATE_EXIT) + prop_text_in.Text = "E"; + else if(process_in->state->s == LTTV_STATE_WAIT) + prop_text_in.Text = "W"; + else if(process_in->state->s == LTTV_STATE_RUN) + prop_text_in.Text = "R"; + else + prop_text_in.Text = "U"; + + draw_text((void*)&prop_text_in, (void*)draw_context_in); + + } + return 0; } -#endif void update_time_window_hook(void *hook_data, void *call_data) { - ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data; - TimeWindow* Time_Window = - guicontrolflow_get_time_window(Control_Flow_Data); + ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + TimeWindow *Old_Time_Window = + guicontrolflow_get_time_window(control_flow_data); TimeWindow *New_Time_Window = ((TimeWindow*)call_data); - - // As the time interval change will mostly be used for - // zoom in and out, it's not useful to keep old drawing - // sections, as scale will be changed. + /* Two cases : zoom in/out or scrolling */ + + /* In order to make sure we can reuse the old drawing, the scale must + * be the same and the new time interval being partly located in the + * currently shown time interval. (reuse is only for scrolling) + */ + + g_info("Old time window HOOK : %u, %u to %u, %u", + Old_Time_Window->start_time.tv_sec, + Old_Time_Window->start_time.tv_nsec, + Old_Time_Window->time_width.tv_sec, + Old_Time_Window->time_width.tv_nsec); + + g_info("New time window HOOK : %u, %u to %u, %u", + New_Time_Window->start_time.tv_sec, + New_Time_Window->start_time.tv_nsec, + New_Time_Window->time_width.tv_sec, + New_Time_Window->time_width.tv_nsec); + + if( New_Time_Window->time_width.tv_sec == Old_Time_Window->time_width.tv_sec + && New_Time_Window->time_width.tv_nsec == Old_Time_Window->time_width.tv_nsec) + { + /* Same scale (scrolling) */ + g_info("scrolling"); + LttTime *ns = &New_Time_Window->start_time; + LttTime *os = &Old_Time_Window->start_time; + LttTime old_end = ltt_time_add(Old_Time_Window->start_time, + Old_Time_Window->time_width); + LttTime new_end = ltt_time_add(New_Time_Window->start_time, + New_Time_Window->time_width); + //if(nsDrawing->Drawing_Area_V->allocation.width; + convert_time_to_pixels( + *os, + old_end, + *ns, + width, + &x); + + /* Copy old data to new location */ + gdk_draw_drawable (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + control_flow_data->Drawing->Pixmap, + x, 0, + 0, 0, + -1, -1); + + convert_time_to_pixels( + *ns, + new_end, + old_end, + width, + &x); + + *Old_Time_Window = *New_Time_Window; + /* Clear the data request background, but not SAFETY */ + gdk_draw_rectangle (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + TRUE, + x+SAFETY, 0, + control_flow_data->Drawing->width - x, // do not overlap + control_flow_data->Drawing->height+SAFETY); + /* Get new data for the rest. */ + drawing_data_request(control_flow_data->Drawing, + &control_flow_data->Drawing->Pixmap, + x, 0, + control_flow_data->Drawing->width - x, + control_flow_data->Drawing->height); + + drawing_refresh(control_flow_data->Drawing, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + + + } else { + //if(nsDrawing->Drawing_Area_V->allocation.width; + convert_time_to_pixels( + *ns, + new_end, + *os, + width, + &x); + + /* Copy old data to new location */ + gdk_draw_drawable (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + control_flow_data->Drawing->Pixmap, + 0, 0, + x, 0, + -1, -1); + + *Old_Time_Window = *New_Time_Window; + + /* Clean the data request background */ + gdk_draw_rectangle (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + TRUE, + 0, 0, + x, // do not overlap + control_flow_data->Drawing->height+SAFETY); + /* Get new data for the rest. */ + drawing_data_request(control_flow_data->Drawing, + &control_flow_data->Drawing->Pixmap, + 0, 0, + x, + control_flow_data->Drawing->height); + + drawing_refresh(control_flow_data->Drawing, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + + } else { + g_info("scrolling far"); + /* Cannot reuse any part of the screen : far jump */ + *Old_Time_Window = *New_Time_Window; + + + gdk_draw_rectangle (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + TRUE, + 0, 0, + control_flow_data->Drawing->width+SAFETY, // do not overlap + control_flow_data->Drawing->height+SAFETY); + + drawing_data_request(control_flow_data->Drawing, + &control_flow_data->Drawing->Pixmap, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + + drawing_refresh(control_flow_data->Drawing, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + } + } + } else { + /* Different scale (zoom) */ + g_info("zoom"); + + *Old_Time_Window = *New_Time_Window; + + gdk_draw_rectangle (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + TRUE, + 0, 0, + control_flow_data->Drawing->width+SAFETY, // do not overlap + control_flow_data->Drawing->height+SAFETY); - *Time_Window = *New_Time_Window; - g_critical("New time window HOOK : %u, %u to %u, %u", - Time_Window->start_time.tv_sec, - Time_Window->start_time.tv_nsec, - Time_Window->time_width.tv_sec, - Time_Window->time_width.tv_nsec); - - drawing_data_request(Control_Flow_Data->Drawing, - &Control_Flow_Data->Drawing->Pixmap, - 0, 0, - Control_Flow_Data->Drawing->width, - Control_Flow_Data->Drawing->height); - - drawing_refresh(Control_Flow_Data->Drawing, - 0, 0, - Control_Flow_Data->Drawing->width, - Control_Flow_Data->Drawing->height); + + drawing_data_request(control_flow_data->Drawing, + &control_flow_data->Drawing->Pixmap, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + + drawing_refresh(control_flow_data->Drawing, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + } + } void update_current_time_hook(void *hook_data, void *call_data) @@ -427,7 +763,7 @@ void update_current_time_hook(void *hook_data, void *call_data) LttTime* Current_Time = guicontrolflow_get_current_time(Control_Flow_Data); *Current_Time = *((LttTime*)call_data); - g_critical("New Current time HOOK : %u, %u", Current_Time->tv_sec, + g_info("New Current time HOOK : %u, %u", Current_Time->tv_sec, Current_Time->tv_nsec); /* If current time is inside time interval, just move the highlight