X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=924f3711ba8660b2ba34c61559bddff37386e942;hb=a2aab3a3417958dbbb2dff69c15d1206ec7d28b1;hp=97020813aa3381fe53c16ca4c01ca78ae48404d5;hpb=e72908ed8d4eeefde92f303b49d375b58476833a;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 97020813..924f3711 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; @@ -386,7 +385,7 @@ 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; @@ -394,13 +393,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = drawing->width; /* we are in a schedchange, before the state update. We must draw the @@ -429,6 +426,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) * be added after the state update. */ LttvProcessState *process; process = lttv_state_find_process(tfs, pid_out); + //process = tfs->process; if(process != NULL) { /* Well, the process_out existed : we must get it in the process hash @@ -437,8 +435,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); @@ -453,6 +450,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) { g_assert(pid_out == 0 || pid_out != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid_out, process->last_cpu, @@ -461,15 +459,13 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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, + process_info, + hashed_process_data, &y, - &height, - &hashed_process_data); + &height); drawing_insert_square( drawing, y, height); } @@ -483,11 +479,29 @@ 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; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); @@ -503,7 +517,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) gdk_draw_point(drawing->pixmap, drawing->gc, x, - y+1); + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; } /* jump */ } else { @@ -538,6 +553,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); } } } @@ -560,8 +579,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); @@ -576,6 +594,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) { g_assert(pid_in == 0 || pid_in != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid_in, process->last_cpu, @@ -584,15 +603,13 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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, + process_info, + hashed_process_data, &y, - &height, - &hashed_process_data); + &height); drawing_insert_square( drawing, y, height); } @@ -606,12 +623,31 @@ 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; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); @@ -627,7 +663,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) gdk_draw_point(drawing->pixmap, drawing->gc, x, - y+1); + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; } /* jump */ } else { @@ -663,6 +700,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); } } } @@ -688,11 +729,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) @@ -706,8 +747,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); @@ -800,13 +840,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); @@ -1301,7 +1338,7 @@ 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; @@ -1310,12 +1347,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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -1325,8 +1361,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; { @@ -1359,6 +1394,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) &hashed_process_data_in) == 1) { g_assert(pid_in == 0 || pid_in != process_in->ppid); + ProcessInfo *process_info; /* Process not present */ processlist_add(process_list, pid_in, @@ -1368,33 +1404,33 @@ int after_schedchange_hook(void *hook_data, void *call_data) 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, + process_info, + hashed_process_data_in, + &y_in, + &height); drawing_insert_square( control_flow_data->drawing, y_in, height); } - guint new_x; - - convert_time_to_pixels( - time_window.start_time, - end_time, - 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; - } + 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; @@ -1418,11 +1454,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; @@ -1437,8 +1473,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); @@ -1532,13 +1567,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); @@ -1915,7 +1948,7 @@ 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; @@ -1924,12 +1957,11 @@ 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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = drawing->width; @@ -1949,8 +1981,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); @@ -1964,6 +1995,7 @@ int before_execmode_hook(void *hook_data, void *call_data) &hashed_process_data) == 1) { g_assert(pid == 0 || pid != process->ppid); + ProcessInfo *process_info; /* Process not present */ processlist_add(process_list, pid, @@ -1973,15 +2005,13 @@ int before_execmode_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); drawing_insert_square( drawing, y, height); } @@ -1995,12 +2025,31 @@ 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; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); @@ -2016,7 +2065,8 @@ int before_execmode_hook(void *hook_data, void *call_data) gdk_draw_point(drawing->pixmap, drawing->gc, x, - y+1); + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; } /* jump */ } else { @@ -2051,6 +2101,10 @@ int before_execmode_hook(void *hook_data, void *call_data) 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); } } @@ -2075,7 +2129,7 @@ int after_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; @@ -2084,12 +2138,11 @@ 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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -2099,9 +2152,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; @@ -2124,6 +2175,7 @@ int after_execmode_hook(void *hook_data, void *call_data) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid, process->last_cpu, @@ -2132,33 +2184,33 @@ int after_execmode_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); 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); - - 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; - } + 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; } @@ -2183,7 +2235,7 @@ 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; @@ -2192,12 +2244,11 @@ 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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -2218,8 +2269,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); @@ -2237,6 +2287,7 @@ int before_process_hook(void *hook_data, void *call_data) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid, process->last_cpu, @@ -2245,15 +2296,13 @@ int before_process_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); drawing_insert_square( control_flow_data->drawing, y, height); } @@ -2267,12 +2316,31 @@ 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; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); @@ -2288,7 +2356,8 @@ int before_process_hook(void *hook_data, void *call_data) gdk_draw_point(drawing->pixmap, drawing->gc, x, - y+1); + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; } /* jump */ } else { @@ -2323,6 +2392,10 @@ int before_process_hook(void *hook_data, void *call_data) 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); } } @@ -2355,7 +2428,7 @@ 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; @@ -2364,12 +2437,11 @@ 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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = control_flow_data->drawing->width; @@ -2393,9 +2465,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); @@ -2416,6 +2486,7 @@ int after_process_hook(void *hook_data, void *call_data) { g_assert(child_pid == 0 || child_pid != process_child->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, child_pid, process_child->last_cpu, @@ -2424,40 +2495,41 @@ int after_process_hook(void *hook_data, void *call_data) 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, + process_info, + 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); + 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; + 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 */ @@ -2469,9 +2541,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); @@ -2490,6 +2560,7 @@ int after_process_hook(void *hook_data, void *call_data) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid, process->last_cpu, @@ -2498,32 +2569,32 @@ int after_process_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); 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); - 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; + 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; @@ -2573,11 +2644,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); @@ -2642,8 +2712,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); @@ -2899,6 +2968,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); } @@ -2913,6 +2984,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); @@ -2950,12 +3023,11 @@ 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); - +#ifdef EXTRA_CHECK 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; +#endif //EXTRA_CHECK guint width = drawing->width; @@ -2982,8 +3054,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 */ @@ -2993,14 +3064,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. @@ -3012,12 +3080,14 @@ 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; convert_time_to_pixels( - time_window.start_time, - end_time, + time_window, evtime, width, &x); @@ -3058,14 +3128,17 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) 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, - draw_context.drawinfo.y.over); + 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; @@ -3078,6 +3151,10 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) hashed_process_data->x.middle = x; /* but don't use the pixel */ hashed_process_data->x.middle_used = FALSE; + + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); } } } @@ -3089,7 +3166,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); @@ -3099,7 +3176,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); @@ -3120,11 +3197,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; @@ -3150,13 +3226,12 @@ 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; if(tfc != NULL) end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);