X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=14ae53593982d15f5bd782a12ec8e63b11828b92;hb=6550d71135aed5d81a76d7d5625757570bcf0819;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..14ae5359 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,8 +270,55 @@ 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; + +} -static __inline PropertiesLine prepare_status_line(LttvProcessState *process) +#if 0 +static inline PropertiesLine prepare_status_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 2; @@ -303,7 +355,7 @@ static __inline PropertiesLine prepare_status_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_schedchange_hook @@ -333,21 +385,12 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; guint width = drawing->width; @@ -376,7 +419,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) * present, it's a new process and it was not present : it will * be added after the state update. */ LttvProcessState *process; - process = lttv_state_find_process(tfs, pid_out); + /* unknown state, bad current pid */ + if(tfs->process->pid != pid_out) + process = lttv_state_find_process(tfs, pid_out); + else + process = tfs->process; if(process != NULL) { /* Well, the process_out existed : we must get it in the process hash @@ -385,42 +432,37 @@ 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); - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid_out, - process->last_cpu, + process->last_cpu_index, &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) + tfc->t_context->index); + if(hashed_process_data == NULL) { g_assert(pid_out == 0 || pid_out != process->ppid); + const gchar *name = g_quark_to_string(process->name); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid_out, - process->last_cpu, + process->last_cpu_index, process->ppid, &birth, tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_out, - process->last_cpu, - &birth, - tfc->t_context->index, + processlist_get_pixels_from_data(process_list, + hashed_process_data, &y, - &height, - &hashed_process_data); + &height); drawing_insert_square( drawing, y, 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. */ @@ -431,44 +473,112 @@ 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) { - guint x; - DrawContext draw_context; - - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); + if(hashed_process_data->x.middle_marked == FALSE) { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + + 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 { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + - /* 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; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + guint x; + convert_time_to_pixels( + 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,41 +600,38 @@ 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); - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid_in, - process->last_cpu, + process->last_cpu_index, &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) + tfc->t_context->index); + if(hashed_process_data == NULL) { g_assert(pid_in == 0 || pid_in != process->ppid); + const gchar *name = g_quark_to_string(process->name); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid_in, - process->last_cpu, + process->last_cpu_index, process->ppid, &birth, tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_in, - process->last_cpu, - &birth, - tfc->t_context->index, + processlist_get_pixels_from_data(process_list, + hashed_process_data, &y, - &height, - &hashed_process_data); + &height); drawing_insert_square( drawing, y, height); } + //We could set the current process and hash here, but will be done + //by after schedchange hook /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. @@ -536,45 +643,111 @@ 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) { + + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + 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 { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK 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,11 +772,11 @@ 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 time_window.end_time = time_window.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) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) @@ -617,8 +790,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 +883,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.time_window.end_time; convert_time_to_pixels( - time_window.start_time, - window_end, + time_window, time, width, &x); @@ -1212,21 +1381,12 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; guint width = control_flow_data->drawing->width; @@ -1236,8 +1396,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; { @@ -1253,54 +1412,80 @@ int after_schedchange_hook(void *hook_data, void *call_data) /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); + //process_in = lttv_state_find_process(tfs, pid_in); + process_in = tfs->process; /* It should exist, because we are after the state update. */ g_assert(process_in != NULL); birth = process_in->creation_time; - const gchar *name = g_quark_to_string(process_in->name); - if(processlist_get_process_pixels(process_list, + hashed_process_data_in = processlist_get_process_data(process_list, pid_in, - process_in->last_cpu, + process_in->last_cpu_index, &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in) == 1) + tfc->t_context->index); + if(hashed_process_data_in == NULL) { g_assert(pid_in == 0 || pid_in != process_in->ppid); + const gchar *name = g_quark_to_string(process_in->name); + ProcessInfo *process_info; /* Process not present */ processlist_add(process_list, pid_in, - process_in->last_cpu, + process_in->last_cpu_index, process_in->ppid, &birth, tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data_in); - processlist_get_process_pixels(process_list, - pid_in, - process_in->last_cpu, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in); + processlist_get_pixels_from_data(process_list, + hashed_process_data_in, + &y_in, + &height); drawing_insert_square( control_flow_data->drawing, y_in, height); } + /* Set the current process */ + process_list->current_hash_data[process_in->last_cpu_index] = + hashed_process_data_in; + + if(ltt_time_compare(hashed_process_data_in->next_good_time, + evtime) <= 0) + { + processlist_get_pixels_from_data(process_list, + hashed_process_data_in, + &y_in, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + + 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_in->x.middle); + 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,11 +1503,11 @@ 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 time_window.end_time = time_window.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) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; @@ -1337,8 +1522,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 +1616,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->time_window.end_time; //convert_time_to_pixels( - // time_window->start_time, - // window_end, + // *time_window, // time, // width, // &x); @@ -1754,7 +1936,8 @@ int after_schedchange_hook(void *hook_data, void *call_data) #endif //0 } -static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) +#if 0 +static inline PropertiesLine prepare_execmode_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 1; @@ -1784,7 +1967,7 @@ static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_execmode_hook @@ -1814,22 +1997,12 @@ int before_execmode_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - guint width = drawing->width; /* we are in a execmode, before the state update. We must draw the @@ -1848,40 +2021,42 @@ 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); - - if(processlist_get_process_pixels(process_list, + + if(process_list->current_hash_data[tfc->index] != NULL) { + hashed_process_data = process_list->current_hash_data[tfc->index]; + } else { + hashed_process_data = processlist_get_process_data(process_list, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(hashed_process_data == NULL) + { + g_assert(pid == 0 || pid != process->ppid); + ProcessInfo *process_info; + /* Process not present */ + const gchar *name = g_quark_to_string(process->name); + processlist_add(process_list, pid, - process->last_cpu, + process->last_cpu_index, + process->ppid, &birth, tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( drawing, y, height); + name, + &pl_height, + &process_info, + &hashed_process_data); + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + drawing_insert_square( drawing, y, height); + } + /* Set the current process */ + process_list->current_hash_data[process->last_cpu_index] = + hashed_process_data; } /* Now, the process is in the state hash and our own process hash. @@ -1894,44 +2069,111 @@ 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) { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + 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 { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK 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; @@ -1949,28 +2191,24 @@ int before_execmode_hook(void *hook_data, void *call_data) */ int after_execmode_hook(void *hook_data, void *call_data) { + /**************** DOES NOTHING!! *************/ + /* hook desactivated in drawing.c */ + return 0; + + + EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - guint width = control_flow_data->drawing->width; /* Add process to process list (if not present) */ @@ -1979,9 +2217,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; @@ -1991,45 +2227,75 @@ int after_execmode_hook(void *hook_data, void *call_data) guint pid = process->pid; birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - if(processlist_get_process_pixels(process_list, + if(process_list->current_hash_data[tfc->index] != NULL) { + hashed_process_data = process_list->current_hash_data[tfc->index]; + } else { + hashed_process_data = processlist_get_process_data(process_list, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(hashed_process_data == NULL) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + const gchar *name = g_quark_to_string(process->name); + ProcessInfo *process_info; + processlist_add(process_list, pid, - process->last_cpu, + process->last_cpu_index, + process->ppid, &birth, tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); + name, + &pl_height, + &process_info, + &hashed_process_data); + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + drawing_insert_square( control_flow_data->drawing, y, height); + } + /* Set the current process */ + process_list->current_hash_data[process->last_cpu_index] = + hashed_process_data; } - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data->x.over); + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0) + { +#if 0 + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); +#endif //0 + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + + + 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; } @@ -2054,22 +2320,12 @@ int before_process_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - guint width = control_flow_data->drawing->width; guint sub_id; @@ -2089,43 +2345,42 @@ 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); birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - if(processlist_get_process_pixels(process_list, + if(process_list->current_hash_data[tfc->index] != NULL) { + hashed_process_data = process_list->current_hash_data[tfc->index]; + } else { + hashed_process_data = processlist_get_process_data(process_list, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(hashed_process_data == NULL) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + const gchar *name = g_quark_to_string(process->name); + ProcessInfo *process_info; + processlist_add(process_list, pid, - process->last_cpu, + process->last_cpu_index, + process->ppid, &birth, tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); + name, + &pl_height, + &process_info, + &hashed_process_data); + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + drawing_insert_square( control_flow_data->drawing, y, height); + } } /* Now, the process is in the state hash and our own process hash. @@ -2138,44 +2393,113 @@ 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) { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + + 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 { + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + 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; } } @@ -2207,22 +2531,12 @@ int after_process_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - guint width = control_flow_data->drawing->width; guint sub_id; @@ -2245,9 +2559,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); @@ -2255,49 +2567,77 @@ int after_process_hook(void *hook_data, void *call_data) g_assert(process_child != NULL); birth = process_child->creation_time; - const gchar *name = g_quark_to_string(process_child->name); - if(processlist_get_process_pixels(process_list, + hashed_process_data_child = processlist_get_process_data(process_list, child_pid, - process_child->last_cpu, + process_child->last_cpu_index, &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child) == 1) + tfc->t_context->index); + if(hashed_process_data_child == NULL) { g_assert(child_pid == 0 || child_pid != process_child->ppid); /* Process not present */ + const gchar *name = g_quark_to_string(process_child->name); + ProcessInfo *process_info; processlist_add(process_list, child_pid, - process_child->last_cpu, + process_child->last_cpu_index, process_child->ppid, &birth, tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data_child); - processlist_get_process_pixels(process_list, - child_pid, - process_child->last_cpu, - &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child); + processlist_get_pixels_from_data(process_list, + hashed_process_data_child, + &y_child, + &height); 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) + { +#if 0 + processlist_get_pixels_from_data(process_list, + hashed_process_data_child, + &y_child, + &height); +#endif //0 + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + + 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,55 +2648,80 @@ 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); birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - if(processlist_get_process_pixels(process_list, + if(process_list->current_hash_data[tfc->index] != NULL) { + hashed_process_data = process_list->current_hash_data[tfc->index]; + } else { + hashed_process_data = processlist_get_process_data(process_list, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(hashed_process_data == NULL) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + const gchar *name = g_quark_to_string(process->name); + ProcessInfo *process_info; + processlist_add(process_list, pid, - process->last_cpu, + process->last_cpu_index, + process->ppid, &birth, tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) + name, + &pl_height, + &process_info, + &hashed_process_data); + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); + drawing_insert_square( control_flow_data->drawing, y, height); + } + + /* Set the current process */ + process_list->current_hash_data[process->last_cpu_index] = + hashed_process_data; + } + + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0) { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); +#if 0 + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); +#endif //0 + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + + 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; + } } - guint new_x; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &new_x); - hashed_process_data->x.middle = new_x; } return 0; @@ -2406,11 +2771,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 +2839,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 +3095,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 +3111,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); @@ -2780,16 +3147,6 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss; LttTime evtime = closure_data->end_time; - 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); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - guint width = drawing->width; { @@ -2799,8 +3156,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) * draw items from the beginning of the read for it. If it is not * present, it's a new process and it was not present : it will * be added after the state update. */ +#ifdef EXTRA_CHECK g_assert(lttv_traceset_number(tsc->ts) > 0); - +#endif //EXTRA_CHECK /* tracefiles[0] is ok here, because we draw for every PID, and * assume CPU 0 for PID 0 //FIXME */ LttvTracefileState *tfs = @@ -2815,25 +3173,18 @@ 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 */ if(control_flow_data->background_info_waiting==0) g_assert(ltt_time_compare(process->creation_time, process_info->birth) == 0); - 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, + 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 +3196,28 @@ 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) { + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK 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 +3235,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); + } + } } } } @@ -2901,7 +3290,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) int before_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; drawing_chunk_begin(events_request, tss); @@ -2911,7 +3300,7 @@ int before_chunk(void *hook_data, void *call_data) int before_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; drawing_data_request_begin(events_request, tss); @@ -2932,11 +3321,10 @@ int after_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; + LttvTracesetContext *tsc = (LttvTracesetContext*)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; @@ -2962,14 +3350,16 @@ int after_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; + LttvTracesetContext *tsc = (LttvTracesetContext*)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; + g_free(process_list->current_hash_data); + process_list->current_hash_data = NULL; + if(tfc != NULL) end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time); else /* end of traceset, or position now out of request : end */