X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=e1afc464b439606d3a0a0c7808116712ffdeeed1;hb=fae7b8ee15af7d3c4eea352cea6f73a1c89a5ac0;hp=3b779352201c0e31f9be48f65084cbde8c813c6b;hpb=10a1069a786aebb338aee5a31c1e3e17198aacbb;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c index 3b779352..e1afc464 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -97,8 +97,7 @@ static void process_add(gpointer key, LttTime birth; guint y = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; pid = process->pid; birth = process->creation_time; @@ -206,7 +205,13 @@ void request_background_data(ControlFlowData *control_flow_data) background_ready_hook); control_flow_data->background_info_waiting++; } + } else { + /* Data ready. Be its nature, this viewer doesn't need to have + * its data ready hook called htere, because a background + * request is always linked with a redraw. + */ } + } lttv_hooks_destroy(background_ready_hook); @@ -265,7 +270,54 @@ int event_selected_hook(void *hook_data, void *call_data) } +/* Function that selects the color of status&exemode line */ +static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process) +{ + PropertiesLine prop_line; + prop_line.line_width = 2; + prop_line.style = GDK_LINE_SOLID; + prop_line.y = MIDDLE; + //GdkColormap *colormap = gdk_colormap_get_system(); + + g_debug("prepare_status_line for state : %s", + g_quark_to_string(process->state->s)); + if(process->state->s == LTTV_STATE_RUN) { + if(process->state->t == LTTV_STATE_USER_MODE) + prop_line.color = drawing_colors[COL_RUN_USER_MODE]; + else if(process->state->t == LTTV_STATE_SYSCALL) + prop_line.color = drawing_colors[COL_RUN_SYSCALL]; + else if(process->state->t == LTTV_STATE_TRAP) + prop_line.color = drawing_colors[COL_RUN_TRAP]; + else if(process->state->t == LTTV_STATE_IRQ) + prop_line.color = drawing_colors[COL_RUN_IRQ]; + else if(process->state->t == LTTV_STATE_MODE_UNKNOWN) + prop_line.color = drawing_colors[COL_MODE_UNKNOWN]; + else + g_assert(FALSE); /* RUNNING MODE UNKNOWN */ + } else if(process->state->s == LTTV_STATE_WAIT) { + /* We don't show if we wait while in user mode, trap, irq or syscall */ + prop_line.color = drawing_colors[COL_WAIT]; + } else if(process->state->s == LTTV_STATE_WAIT_CPU) { + /* We don't show if we wait for CPU while in user mode, trap, irq + * or syscall */ + prop_line.color = drawing_colors[COL_WAIT_CPU]; + } else if(process->state->s == LTTV_STATE_ZOMBIE) { + prop_line.color = drawing_colors[COL_ZOMBIE]; + } else if(process->state->s == LTTV_STATE_WAIT_FORK) { + prop_line.color = drawing_colors[COL_WAIT_FORK]; + } else if(process->state->s == LTTV_STATE_EXIT) { + prop_line.color = drawing_colors[COL_EXIT]; + } else if(process->state->s == LTTV_STATE_UNNAMED) { + prop_line.color = drawing_colors[COL_UNNAMED]; + } else + g_assert(FALSE); /* UNKNOWN STATE */ + + return prop_line; + +} + +#if 0 static __inline PropertiesLine prepare_status_line(LttvProcessState *process) { PropertiesLine prop_line; @@ -303,7 +355,7 @@ static __inline PropertiesLine prepare_status_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_schedchange_hook @@ -342,13 +394,12 @@ int before_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; - +#endif //EXTRA_CHECK guint width = drawing->width; /* we are in a schedchange, before the state update. We must draw the @@ -385,8 +436,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) /* Add process to process list (if not present) */ guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; const gchar *name = g_quark_to_string(process->name); @@ -431,44 +481,85 @@ int before_schedchange_hook(void *hook_data, void *call_data) * value. */ g_assert(hashed_process_data->x.middle != -1); + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0) { + if(hashed_process_data->x.middle_marked == FALSE) { + guint x; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); + + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + } else { guint x; - DrawContext draw_context; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); - - /* Now create the drawing context that will be used to draw - * items related to the last state. */ - draw_context.drawable = drawing->pixmap; - draw_context.gc = drawing->gc; - draw_context.pango_layout = drawing->pango_layout; - draw_context.drawinfo.start.x = hashed_process_data->x.middle; - draw_context.drawinfo.end.x = x; - - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + time_window, + evtime, + width, + &x); - draw_context.drawinfo.start.offset.over = 0; - draw_context.drawinfo.start.offset.middle = 0; - draw_context.drawinfo.start.offset.under = 0; - draw_context.drawinfo.end.offset.over = 0; - draw_context.drawinfo.end.offset.middle = 0; - draw_context.drawinfo.end.offset.under = 0; + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) { - /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); - draw_line((void*)&prop_line, (void*)&draw_context); + if(hashed_process_data->x.middle_marked == FALSE) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + /* jump */ + } else { + DrawContext draw_context; + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; + + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_s_e_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.middle = x; + hashed_process_data->x.middle_used = TRUE; + hashed_process_data->x.middle_marked = FALSE; + + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); } - /* become the last x position */ - hashed_process_data->x.middle = x; } } } @@ -490,8 +581,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) /* Add process to process list (if not present) */ guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; const gchar *name = g_quark_to_string(process->name); @@ -536,45 +626,88 @@ int before_schedchange_hook(void *hook_data, void *call_data) * value. */ g_assert(hashed_process_data->x.middle != -1); + + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0) { + if(hashed_process_data->x.middle_marked == FALSE) { + guint x; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); + + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + } else { guint x; - DrawContext draw_context; convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); + time_window, + evtime, + width, + &x); - /* Now create the drawing context that will be used to draw - * items related to the last state. */ - draw_context.drawable = drawing->pixmap; - draw_context.gc = drawing->gc; - draw_context.pango_layout = drawing->pango_layout; - draw_context.drawinfo.start.x = hashed_process_data->x.middle; - draw_context.drawinfo.end.x = x; - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) + { + if(hashed_process_data->x.middle_marked == FALSE) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + /* jump */ + } else { + DrawContext draw_context; - draw_context.drawinfo.start.offset.over = 0; - draw_context.drawinfo.start.offset.middle = 0; - draw_context.drawinfo.start.offset.under = 0; - draw_context.drawinfo.end.offset.over = 0; - draw_context.drawinfo.end.offset.middle = 0; - draw_context.drawinfo.end.offset.under = 0; + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; - { - /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); - draw_line((void*)&prop_line, (void*)&draw_context); - } + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; - - /* become the last x position */ - hashed_process_data->x.middle = x; + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_s_e_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + } + + + /* become the last x position */ + hashed_process_data->x.middle = x; + hashed_process_data->x.middle_used = TRUE; + hashed_process_data->x.middle_marked = FALSE; + + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); + } } } } @@ -599,8 +732,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; + //if(time < time_beg || time > time_end) return; if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) @@ -617,8 +750,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttTime birth; guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttField *f = ltt_event_field(e); @@ -711,13 +843,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttTime time = ltt_event_time(e); - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); - + LttTime window_end = time_window.end_time; convert_time_to_pixels( - time_window.start_time, - window_end, + time_window, time, width, &x); @@ -1221,12 +1350,13 @@ int after_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -1236,8 +1366,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) guint y_in = 0, y_out = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data_in = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; guint pid_in; { @@ -1291,16 +1420,29 @@ int after_schedchange_hook(void *hook_data, void *call_data) drawing_insert_square( control_flow_data->drawing, y_in, height); } - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data_in->x.middle); + if(ltt_time_compare(hashed_process_data_in->next_good_time, + evtime) <= 0) + { + guint new_x; + + convert_time_to_pixels( + time_window, + evtime, + width, + &new_x); + + if(hashed_process_data_in->x.middle != new_x) { + hashed_process_data_in->x.middle = new_x; + hashed_process_data_in->x.middle_used = FALSE; + hashed_process_data_in->x.middle_marked = FALSE; + } + } return 0; + + #if 0 EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; @@ -1318,8 +1460,8 @@ int after_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; + //if(time < time_beg || time > time_end) return; if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) @@ -1337,8 +1479,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttTime birth; guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttField *f = ltt_event_field(e); @@ -1432,13 +1573,11 @@ int after_schedchange_hook(void *hook_data, void *call_data) //LttTime time = ltt_event_time(e); - //LttTime window_end = ltt_time_add(time_window->time_width, - // time_window->start_time); + //LttTime window_end = time_window->end_time; //convert_time_to_pixels( - // time_window->start_time, - // window_end, + // *time_window, // time, // width, // &x); @@ -1754,6 +1893,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) #endif //0 } +#if 0 static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) { PropertiesLine prop_line; @@ -1784,7 +1924,7 @@ static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_execmode_hook @@ -1823,12 +1963,13 @@ int before_execmode_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; +#endif //EXTRA_CHECK guint width = drawing->width; @@ -1848,8 +1989,7 @@ int before_execmode_hook(void *hook_data, void *call_data) /* Add process to process list (if not present) */ guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; const gchar *name = g_quark_to_string(process->name); @@ -1894,44 +2034,87 @@ int before_execmode_hook(void *hook_data, void *call_data) * value. */ g_assert(hashed_process_data->x.over != -1); + + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0) { + if(hashed_process_data->x.middle_marked == FALSE) { + guint x; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); + + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + } else { guint x; - DrawContext draw_context; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); - /* Now create the drawing context that will be used to draw - * items related to the last state. */ - draw_context.drawable = drawing->pixmap; - draw_context.gc = drawing->gc; - draw_context.pango_layout = drawing->pango_layout; - draw_context.drawinfo.start.x = hashed_process_data->x.over; - draw_context.drawinfo.end.x = x; - - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; - - draw_context.drawinfo.start.offset.over = 0; - draw_context.drawinfo.start.offset.middle = 0; - draw_context.drawinfo.start.offset.under = 0; - draw_context.drawinfo.end.offset.over = 0; - draw_context.drawinfo.end.offset.middle = 0; - draw_context.drawinfo.end.offset.under = 0; + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) { - /* Draw the line */ - PropertiesLine prop_line = prepare_execmode_line(process); - draw_line((void*)&prop_line, (void*)&draw_context); + if(hashed_process_data->x.middle_marked == FALSE) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + /* jump */ + } else { + + DrawContext draw_context; + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_s_e_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.middle = x; + hashed_process_data->x.middle_used = TRUE; + hashed_process_data->x.middle_marked = FALSE; + + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); } - /* become the last x position */ - hashed_process_data->x.over = x; } return 0; @@ -1964,12 +2147,13 @@ int after_execmode_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -1979,9 +2163,7 @@ int after_execmode_hook(void *hook_data, void *call_data) guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + ProcessList *process_list = control_flow_data->process_list; /* Find process pid_in in the list... */ process = tfs->process; @@ -2023,13 +2205,24 @@ int after_execmode_hook(void *hook_data, void *call_data) &hashed_process_data); drawing_insert_square( control_flow_data->drawing, y, height); } + + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0) + { + guint new_x; + + convert_time_to_pixels( + time_window, + evtime, + width, + &new_x); - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data->x.over); + if(hashed_process_data->x.middle != new_x) { + hashed_process_data->x.middle = new_x; + hashed_process_data->x.middle_used = FALSE; + hashed_process_data->x.middle_marked = FALSE; + } + } return 0; } @@ -2063,12 +2256,13 @@ int before_process_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -2089,8 +2283,7 @@ int before_process_hook(void *hook_data, void *call_data) guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; g_assert(process != NULL); @@ -2138,44 +2331,87 @@ int before_process_hook(void *hook_data, void *call_data) * value. */ g_assert(hashed_process_data->x.over != -1); + + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0) { + if(hashed_process_data->x.middle_marked == FALSE) { + guint x; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); + + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + } else { guint x; - DrawContext draw_context; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); - /* Now create the drawing context that will be used to draw - * items related to the last state. */ - draw_context.drawable = drawing->pixmap; - draw_context.gc = drawing->gc; - draw_context.pango_layout = drawing->pango_layout; - draw_context.drawinfo.start.x = hashed_process_data->x.middle; - draw_context.drawinfo.end.x = x; - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) + { + if(hashed_process_data->x.middle_marked == FALSE) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + /* jump */ + } else { + DrawContext draw_context; - draw_context.drawinfo.start.offset.over = 0; - draw_context.drawinfo.start.offset.middle = 0; - draw_context.drawinfo.start.offset.under = 0; - draw_context.drawinfo.end.offset.over = 0; - draw_context.drawinfo.end.offset.middle = 0; - draw_context.drawinfo.end.offset.under = 0; + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; - { - /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); - draw_line((void*)&prop_line, (void*)&draw_context); + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_s_e_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.middle = x; + hashed_process_data->x.middle_used = TRUE; + hashed_process_data->x.middle_marked = FALSE; + + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); } - /* become the last x position */ - hashed_process_data->x.middle = x; } } @@ -2216,12 +2452,13 @@ int after_process_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -2245,9 +2482,7 @@ int after_process_hook(void *hook_data, void *call_data) guint y_child = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data_child = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + ProcessList *process_list = control_flow_data->process_list; /* Find child in the list... */ process_child = lttv_state_find_process(tfs, child_pid); @@ -2288,16 +2523,32 @@ int after_process_hook(void *hook_data, void *call_data) drawing_insert_square( control_flow_data->drawing, y_child, height); } - guint new_x; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &new_x); - hashed_process_data_child->x.over = new_x; - hashed_process_data_child->x.middle = new_x; - hashed_process_data_child->x.under = new_x; + if(ltt_time_compare(hashed_process_data_child->next_good_time, + evtime) <= 0) + { + guint new_x; + convert_time_to_pixels( + time_window, + evtime, + width, + &new_x); + + if(hashed_process_data_child->x.over != new_x) { + hashed_process_data_child->x.over = new_x; + hashed_process_data_child->x.over_used = FALSE; + hashed_process_data_child->x.over_marked = FALSE; + } + if(hashed_process_data_child->x.middle != new_x) { + hashed_process_data_child->x.middle = new_x; + hashed_process_data_child->x.middle_used = FALSE; + hashed_process_data_child->x.middle_marked = FALSE; + } + if(hashed_process_data_child->x.under != new_x) { + hashed_process_data_child->x.under = new_x; + hashed_process_data_child->x.under_used = FALSE; + hashed_process_data_child->x.under_marked = FALSE; + } + } } else if(sub_id == 3) { /* exit */ @@ -2308,9 +2559,7 @@ int after_process_hook(void *hook_data, void *call_data) guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + ProcessList *process_list = control_flow_data->process_list; /* It should exist, because we are after the state update. */ g_assert(process != NULL); @@ -2349,14 +2598,22 @@ int after_process_hook(void *hook_data, void *call_data) drawing_insert_square( control_flow_data->drawing, y, height); } - guint new_x; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &new_x); - hashed_process_data->x.middle = new_x; + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0) + { + guint new_x; + convert_time_to_pixels( + time_window, + evtime, + width, + &new_x); + if(hashed_process_data->x.middle != new_x) { + hashed_process_data->x.middle = new_x; + hashed_process_data->x.middle_used = FALSE; + hashed_process_data->x.middle_marked = FALSE; + } + } + } return 0; @@ -2406,11 +2663,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Same scale (scrolling) */ g_info("scrolling"); LttTime *ns = &new_time_window->start_time; + LttTime *nw = &new_time_window->time_width; 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); + LttTime *ow = &old_time_window->time_width; + LttTime old_end = old_time_window->end_time; + LttTime new_end = new_time_window->end_time; //if(nsdrawing->width; convert_time_to_pixels( - *os, - old_end, + *old_time_window, *ns, width, &x); @@ -2475,8 +2731,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) guint x = 0; guint width = control_flow_data->drawing->width; convert_time_to_pixels( - *ns, - new_end, + *new_time_window, *os, width, &x); @@ -2732,6 +2987,8 @@ gint update_current_time_hook(void *hook_data, void *call_data) new_time_window.start_time = time_begin; new_time_window.time_width = width; + new_time_window.time_width_double = ltt_time_to_double(width); + new_time_window.end_time = ltt_time_add(time_begin, width); lttvwindow_report_time_window(control_flow_data->tab, new_time_window); } @@ -2746,6 +3003,8 @@ gint update_current_time_hook(void *hook_data, void *call_data) new_time_window.start_time = time_begin; new_time_window.time_width = width; + new_time_window.time_width_double = ltt_time_to_double(width); + new_time_window.end_time = ltt_time_add(time_begin, width); lttvwindow_report_time_window(control_flow_data->tab, new_time_window); @@ -2783,12 +3042,13 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + LttTime end_time = time_window.end_time; +#ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; +#endif //EXTRA_CHECK guint width = drawing->width; @@ -2815,8 +3075,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) /* Only draw for processes that are currently in the trace states */ guint y = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttTime birth = process_info->birth; /* Should be alike when background info is ready */ @@ -2826,14 +3085,11 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) const gchar *name = g_quark_to_string(process->name); /* process HAS to be present */ - g_assert(processlist_get_process_pixels(process_list, - process_info->pid, - process_info->cpu, - &birth, - process_info->trace_num, + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, &y, - &height, - &hashed_process_data) != 1); + &height); /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. @@ -2845,17 +3101,20 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) * value. */ g_assert(hashed_process_data->x.over != -1); + + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0) { guint x; - DrawContext draw_context; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); + DrawContext draw_context; + /* Now create the drawing context that will be used to draw * items related to the last state. */ draw_context.drawable = drawing->pixmap; @@ -2873,25 +3132,52 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) draw_context.drawinfo.end.offset.over = 0; draw_context.drawinfo.end.offset.middle = 0; draw_context.drawinfo.end.offset.under = 0; - +#if 0 + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.over) { + /* jump */ + } else { draw_context.drawinfo.start.x = hashed_process_data->x.over; /* Draw the line */ PropertiesLine prop_line = prepare_execmode_line(process); draw_line((void*)&prop_line, (void*)&draw_context); + hashed_process_data->x.over = x; } - hashed_process_data->x.over = x; - { +#endif //0 + + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) { +#if 0 /* do not mark closure : not missing information */ + if(hashed_process_data->x.middle_marked == FALSE) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } +#endif //0 + /* Jump */ + } else { draw_context.drawinfo.start.x = hashed_process_data->x.middle; /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); + PropertiesLine prop_line = prepare_s_e_line(process); draw_line((void*)&prop_line, (void*)&draw_context); - } + /* become the last x position */ + if(x != hashed_process_data->x.middle) { + hashed_process_data->x.middle = x; + /* but don't use the pixel */ + hashed_process_data->x.middle_used = FALSE; - /* become the last x position */ - hashed_process_data->x.middle = x; + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); + } + } } } } @@ -2935,8 +3221,7 @@ int after_request(void *hook_data, void *call_data) LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttTime end_time = events_request->end_time; ClosureData closure_data; @@ -2967,8 +3252,7 @@ int after_chunk(void *hook_data, void *call_data) LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc); LttTime end_time; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; if(tfc != NULL) end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);