X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=03c1f6e9be95df0c93ab87f362e996a9c9e8c0bf;hb=cd3892fef868e57ca950bcee7cceabd7dcf2c61f;hp=fc23e17ceadb3e443c3018f612ebef1663e058e0;hpb=bc8d270bb296f985deb9e37e29e41d445daaac28;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 fc23e17c..03c1f6e9 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -141,8 +141,6 @@ gint background_ready(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData *)hook_data; LttvTrace *trace = (LttvTrace*)call_data; - LttvTracesetContext *tsc = - lttvwindow_get_traceset_context(control_flow_data->tab); control_flow_data->background_info_waiting--; @@ -266,6 +264,7 @@ int event_selected_hook(void *hook_data, void *call_data) g_debug("DEBUG : event selected by main window : %u", *event_number); + return 0; } /* Function that selects the color of status&exemode line */ @@ -277,9 +276,6 @@ static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) 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]; @@ -402,7 +398,6 @@ int before_schedchange_hook(void *hook_data, void *call_data) pid_out = ltt_event_get_long_unsigned(e,element); element = ltt_field_member(f,1); pid_in = ltt_event_get_long_unsigned(e,element); - g_debug("out : %u in : %u", pid_out, pid_in); } { @@ -424,7 +419,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) * or add it, and draw its items. */ /* Add process to process list (if not present) */ - guint y = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; @@ -440,7 +435,9 @@ int before_schedchange_hook(void *hook_data, void *call_data) const gchar *name = g_quark_to_string(process->name); /* Process not present */ ProcessInfo *process_info; + Drawing_t *drawing = control_flow_data->drawing; processlist_add(process_list, + drawing, pid_out, process->last_cpu_index, process->ppid, @@ -450,31 +447,21 @@ int before_schedchange_hook(void *hook_data, void *call_data) &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); + } /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. */ - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * 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); @@ -494,19 +481,13 @@ int before_schedchange_hook(void *hook_data, void *call_data) /* Draw collision indicator */ gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); - gdk_draw_point(drawing->pixmap, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->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 @@ -531,10 +512,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->height/2)-3); hashed_process_data->x.middle_marked = TRUE; } /* jump */ @@ -543,15 +524,15 @@ int before_schedchange_hook(void *hook_data, void *call_data) /* Now create the drawing context that will be used to draw * items related to the last state. */ - draw_context.drawable = drawing->pixmap; + draw_context.drawable = hashed_process_data->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.y.over = 1; + draw_context.drawinfo.y.middle = (hashed_process_data->height/2); + draw_context.drawinfo.y.under = hashed_process_data->height; draw_context.drawinfo.start.offset.over = 0; draw_context.drawinfo.start.offset.middle = 0; @@ -594,7 +575,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) * or add it, and draw its items. */ /* Add process to process list (if not present) */ - guint y = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; @@ -610,7 +591,9 @@ int before_schedchange_hook(void *hook_data, void *call_data) const gchar *name = g_quark_to_string(process->name); /* Process not present */ ProcessInfo *process_info; + Drawing_t *drawing = control_flow_data->drawing; processlist_add(process_list, + drawing, pid_in, process->last_cpu_index, process->ppid, @@ -620,11 +603,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); + } //We could set the current process and hash here, but will be done //by after schedchange hook @@ -633,22 +616,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) * We definitely can draw the items related to the ending state. */ - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * 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 @@ -667,17 +639,13 @@ int before_schedchange_hook(void *hook_data, void *call_data) /* Draw collision indicator */ gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); - gdk_draw_point(drawing->pixmap, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->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 @@ -703,10 +671,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->height/2)-3); hashed_process_data->x.middle_marked = TRUE; } /* jump */ @@ -715,15 +683,15 @@ int before_schedchange_hook(void *hook_data, void *call_data) /* Now create the drawing context that will be used to draw * items related to the last state. */ - draw_context.drawable = drawing->pixmap; + draw_context.drawable = hashed_process_data->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.y.over = 1; + draw_context.drawinfo.y.middle = (hashed_process_data->height/2); + draw_context.drawinfo.y.under = hashed_process_data->height; draw_context.drawinfo.start.offset.over = 0; draw_context.drawinfo.start.offset.middle = 0; @@ -919,7 +887,6 @@ int before_schedchange_hook(void *hook_data, void *call_data) control_flow_data->drawing->damage_begin; draw_context_out->previous->under->x = control_flow_data->drawing->damage_begin; - g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_begin); } @@ -1388,9 +1355,9 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttTime evtime = ltt_event_time(e); /* Add process to process list (if not present) */ - LttvProcessState *process_out, *process_in; + LttvProcessState *process_in; LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data_in = NULL; ProcessList *process_list = control_flow_data->process_list; @@ -1404,7 +1371,6 @@ int after_schedchange_hook(void *hook_data, void *call_data) pid_out = ltt_event_get_long_unsigned(e,element); element = ltt_field_member(f,1); pid_in = ltt_event_get_long_unsigned(e,element); - g_debug("out : %u in : %u", pid_out, pid_in); } @@ -1427,8 +1393,10 @@ int after_schedchange_hook(void *hook_data, void *call_data) g_assert(pid_in == 0 || pid_in != process_in->ppid); const gchar *name = g_quark_to_string(process_in->name); ProcessInfo *process_info; + Drawing_t *drawing = control_flow_data->drawing; /* Process not present */ processlist_add(process_list, + drawing, pid_in, process_in->last_cpu_index, process_in->ppid, @@ -1438,11 +1406,10 @@ int after_schedchange_hook(void *hook_data, void *call_data) &pl_height, &process_info, &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } /* Set the current process */ process_list->current_hash_data[process_in->last_cpu_index] = @@ -1451,10 +1418,6 @@ int after_schedchange_hook(void *hook_data, void *call_data) 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); @@ -2015,12 +1978,12 @@ int before_execmode_hook(void *hook_data, void *call_data) * or add it, and draw its items. */ /* Add process to process list (if not present) */ - guint y = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; - if(process_list->current_hash_data[tfc->index] != NULL) { + if(likely(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, @@ -2028,13 +1991,15 @@ int before_execmode_hook(void *hook_data, void *call_data) process->last_cpu_index, &birth, tfc->t_context->index); - if(hashed_process_data == NULL) + if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); ProcessInfo *process_info; /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; const gchar *name = g_quark_to_string(process->name); processlist_add(process_list, + drawing, pid, process->last_cpu_index, process->ppid, @@ -2044,11 +2009,10 @@ int before_execmode_hook(void *hook_data, void *call_data) &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } /* Set the current process */ process_list->current_hash_data[process->last_cpu_index] = @@ -2058,22 +2022,11 @@ int before_execmode_hook(void *hook_data, void *call_data) /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. */ - - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); - if(ltt_time_compare(hashed_process_data->next_good_time, - evtime) > 0) + if(likely(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); + if(unlikely(hashed_process_data->x.middle_marked == FALSE)) { TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2093,17 +2046,13 @@ int before_execmode_hook(void *hook_data, void *call_data) /* Draw collision indicator */ gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); - gdk_draw_point(drawing->pixmap, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->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); @@ -2124,16 +2073,16 @@ int before_execmode_hook(void *hook_data, void *call_data) /* 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(unlikely(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used)) { - if(hashed_process_data->x.middle_marked == FALSE) { + if(unlikely(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, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->height/2)-3); hashed_process_data->x.middle_marked = TRUE; } /* jump */ @@ -2142,15 +2091,15 @@ int before_execmode_hook(void *hook_data, void *call_data) 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.drawable = hashed_process_data->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.y.over = 1; + draw_context.drawinfo.y.middle = (hashed_process_data->height/2); + draw_context.drawinfo.y.under = hashed_process_data->height; draw_context.drawinfo.start.offset.over = 0; draw_context.drawinfo.start.offset.middle = 0; @@ -2212,7 +2161,7 @@ int after_execmode_hook(void *hook_data, void *call_data) /* Add process to process list (if not present) */ LttvProcessState *process; LttTime birth; - guint y = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; @@ -2226,7 +2175,7 @@ int after_execmode_hook(void *hook_data, void *call_data) birth = process->creation_time; - if(process_list->current_hash_data[tfc->index] != NULL) { + if(likely(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, @@ -2234,13 +2183,15 @@ int after_execmode_hook(void *hook_data, void *call_data) process->last_cpu_index, &birth, tfc->t_context->index); - if(hashed_process_data == NULL) + if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; const gchar *name = g_quark_to_string(process->name); ProcessInfo *process_info; processlist_add(process_list, + drawing, pid, process->last_cpu_index, process->ppid, @@ -2250,26 +2201,19 @@ int after_execmode_hook(void *hook_data, void *call_data) &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } /* 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) + if(unlikely(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); @@ -2337,7 +2281,7 @@ int before_process_hook(void *hook_data, void *call_data) LttvProcessState *process = tfs->process; guint pid = process->pid; LttTime birth; - guint y = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; @@ -2346,7 +2290,7 @@ int before_process_hook(void *hook_data, void *call_data) birth = process->creation_time; - if(process_list->current_hash_data[tfc->index] != NULL) { + if(likely(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, @@ -2354,13 +2298,15 @@ int before_process_hook(void *hook_data, void *call_data) process->last_cpu_index, &birth, tfc->t_context->index); - if(hashed_process_data == NULL) + if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; const gchar *name = g_quark_to_string(process->name); ProcessInfo *process_info; processlist_add(process_list, + drawing, pid, process->last_cpu_index, process->ppid, @@ -2370,11 +2316,10 @@ int before_process_hook(void *hook_data, void *call_data) &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } } @@ -2382,21 +2327,10 @@ int before_process_hook(void *hook_data, void *call_data) * We definitely can draw the items related to the ending state. */ - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); - - if(ltt_time_compare(hashed_process_data->next_good_time, - evtime) > 0) + if(likely(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); + if(unlikely(hashed_process_data->x.middle_marked == FALSE)) { TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2416,17 +2350,13 @@ int before_process_hook(void *hook_data, void *call_data) /* Draw collision indicator */ gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); - gdk_draw_point(drawing->pixmap, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->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); @@ -2447,16 +2377,16 @@ int before_process_hook(void *hook_data, void *call_data) /* 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(unlikely(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used)) { - if(hashed_process_data->x.middle_marked == FALSE) { + if(unlikely(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, + gdk_draw_point(hashed_process_data->pixmap, drawing->gc, x, - y+(height/2)-3); + (hashed_process_data->height/2)-3); hashed_process_data->x.middle_marked = TRUE; } /* jump */ @@ -2465,15 +2395,15 @@ int before_process_hook(void *hook_data, void *call_data) /* Now create the drawing context that will be used to draw * items related to the last state. */ - draw_context.drawable = drawing->pixmap; + draw_context.drawable = hashed_process_data->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.y.over = 1; + draw_context.drawinfo.y.middle = (hashed_process_data->height/2); + draw_context.drawinfo.y.under = hashed_process_data->height; draw_context.drawinfo.start.offset.over = 0; draw_context.drawinfo.start.offset.middle = 0; @@ -2551,7 +2481,7 @@ int after_process_hook(void *hook_data, void *call_data) /* Add process to process list (if not present) */ LttvProcessState *process_child; LttTime birth; - guint y_child = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data_child = NULL; ProcessList *process_list = control_flow_data->process_list; @@ -2568,13 +2498,15 @@ int after_process_hook(void *hook_data, void *call_data) process_child->last_cpu_index, &birth, tfc->t_context->index); - if(hashed_process_data_child == NULL) + if(likely(hashed_process_data_child == NULL)) { g_assert(child_pid == 0 || child_pid != process_child->ppid); /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; const gchar *name = g_quark_to_string(process_child->name); ProcessInfo *process_info; processlist_add(process_list, + drawing, child_pid, process_child->last_cpu_index, process_child->ppid, @@ -2584,23 +2516,16 @@ int after_process_hook(void *hook_data, void *call_data) &pl_height, &process_info, &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } - if(ltt_time_compare(hashed_process_data_child->next_good_time, - evtime) <= 0) + if(likely(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); @@ -2618,17 +2543,17 @@ int after_process_hook(void *hook_data, void *call_data) width, &new_x); - if(hashed_process_data_child->x.over != new_x) { + if(likely(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) { + if(likely(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) { + if(likely(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; @@ -2641,7 +2566,7 @@ int after_process_hook(void *hook_data, void *call_data) LttvProcessState *process = tfs->process; guint pid = process->pid; LttTime birth; - guint y = 0, height = 0, pl_height = 0; + guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; @@ -2651,7 +2576,7 @@ int after_process_hook(void *hook_data, void *call_data) birth = process->creation_time; - if(process_list->current_hash_data[tfc->index] != NULL) { + if(likely(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, @@ -2659,13 +2584,15 @@ int after_process_hook(void *hook_data, void *call_data) process->last_cpu_index, &birth, tfc->t_context->index); - if(hashed_process_data == NULL) + if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; const gchar *name = g_quark_to_string(process->name); ProcessInfo *process_info; processlist_add(process_list, + drawing, pid, process->last_cpu_index, process->ppid, @@ -2675,11 +2602,10 @@ int after_process_hook(void *hook_data, void *call_data) &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); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } /* Set the current process */ @@ -2687,15 +2613,9 @@ int after_process_hook(void *hook_data, void *call_data) hashed_process_data; } - if(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0) + if(unlikely(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); @@ -2712,7 +2632,7 @@ int after_process_hook(void *hook_data, void *call_data) evtime, width, &new_x); - if(hashed_process_data->x.middle != new_x) { + if(unlikely(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; @@ -2729,6 +2649,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; + ProcessList *process_list = control_flow_data->process_list; const TimeWindowNotifyData *time_window_nofify_data = ((const TimeWindowNotifyData *)call_data); @@ -2750,13 +2671,13 @@ gint update_time_window_hook(void *hook_data, void *call_data) * currently shown time interval. (reuse is only for scrolling) */ - g_info("Old time window HOOK : %u, %u to %u, %u", + g_info("Old time window HOOK : %lu, %lu to %lu, %lu", old_time_window->start_time.tv_sec, old_time_window->start_time.tv_nsec, old_time_window->time_width.tv_sec, old_time_window->time_width.tv_nsec); - g_info("New time window HOOK : %u, %u to %u, %u", + g_info("New time window HOOK : %lu, %lu to %lu, %lu", new_time_window->start_time.tv_sec, new_time_window->start_time.tv_nsec, new_time_window->time_width.tv_sec, @@ -2790,13 +2711,14 @@ gint update_time_window_hook(void *hook_data, void *call_data) &x); /* Copy old data to new location */ - gdk_draw_drawable (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->black_gc, - control_flow_data->drawing->pixmap, - x, 0, - 0, 0, - control_flow_data->drawing->width-x+SAFETY, -1); - + copy_pixmap_region(process_list, + NULL, + control_flow_data->drawing->drawing_area->style->black_gc, + NULL, + x, 0, + 0, 0, + control_flow_data->drawing->width-x+SAFETY, -1); + if(drawing->damage_begin == drawing->damage_end) drawing->damage_begin = control_flow_data->drawing->width-x; else @@ -2805,22 +2727,20 @@ gint update_time_window_hook(void *hook_data, void *call_data) drawing->damage_end = control_flow_data->drawing->width; /* Clear the data request background, but not SAFETY */ - gdk_draw_rectangle (control_flow_data->drawing->pixmap, - //control_flow_data->drawing->drawing_area->style->black_gc, + rectangle_pixmap(process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, drawing->damage_begin+SAFETY, 0, drawing->damage_end - drawing->damage_begin, // do not overlap - control_flow_data->drawing->height); - - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + -1); + gtk_widget_queue_draw(drawing->drawing_area); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, control_flow_data->drawing->height); @@ -2841,11 +2761,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) width, &x); - /* Copy old data to new location */ - gdk_draw_drawable (control_flow_data->drawing->pixmap, + copy_pixmap_region (process_list, + NULL, control_flow_data->drawing->drawing_area->style->black_gc, - control_flow_data->drawing->pixmap, + NULL, 0, 0, x, 0, -1, -1); @@ -2858,22 +2778,22 @@ gint update_time_window_hook(void *hook_data, void *call_data) drawing->damage_begin = 0; - gdk_draw_rectangle (control_flow_data->drawing->pixmap, + rectangle_pixmap (process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, // do not overlap - control_flow_data->drawing->height); + -1); - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, control_flow_data->drawing->height); @@ -2887,23 +2807,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Cannot reuse any part of the screen : far jump */ - gdk_draw_rectangle (control_flow_data->drawing->pixmap, + rectangle_pixmap (process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height); + -1); - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); drawing->damage_begin = 0; drawing->damage_end = control_flow_data->drawing->width; drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, 0, 0, control_flow_data->drawing->width, control_flow_data->drawing->height); @@ -2915,23 +2835,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Different scale (zoom) */ g_info("zoom"); - gdk_draw_rectangle (control_flow_data->drawing->pixmap, + rectangle_pixmap (process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height); + -1); - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); drawing->damage_begin = 0; drawing->damage_end = control_flow_data->drawing->width; drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, 0, 0, control_flow_data->drawing->width, control_flow_data->drawing->height); @@ -2946,7 +2866,6 @@ gint traceset_notify(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; - GtkWidget *widget = drawing->drawing_area; drawing_clear(control_flow_data->drawing); @@ -2954,24 +2873,6 @@ gint traceset_notify(void *hook_data, void *call_data) redraw_notify(control_flow_data, NULL); request_background_data(control_flow_data); -#if 0 - drawing->damage_begin = 0; - drawing->damage_end = drawing->width; - if(drawing->damage_begin < drawing->damage_end) - { - drawing_data_request(drawing, - &drawing->pixmap, - drawing->damage_begin, - 0, - drawing->damage_end-drawing->damage_begin, - drawing->height); - } - - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); -#endif //0 return FALSE; } @@ -2989,29 +2890,29 @@ gint redraw_notify(void *hook_data, void *call_data) drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); - // Clear the image - gdk_draw_rectangle (drawing->pixmap, + // Clear the images + rectangle_pixmap (control_flow_data->process_list, widget->style->black_gc, TRUE, 0, 0, - drawing->width+SAFETY, - drawing->height); + drawing->alloc_width, + -1); + gtk_widget_queue_draw(drawing->drawing_area); if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, - &drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end-drawing->damage_begin, drawing->height); } - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); + //gtk_widget_queue_draw_area(drawing->drawing_area, + // 0,0, + // drawing->width, + // drawing->height); return FALSE; } @@ -3021,14 +2922,12 @@ gint continue_notify(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; - GtkWidget *widget = drawing->drawing_area; //g_assert(widget->allocation.width == drawing->damage_end); if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, - &drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end-drawing->damage_begin, @@ -3065,7 +2964,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) LttTime trace_start = tsc->time_span.start_time; LttTime trace_end = tsc->time_span.end_time; - g_info("New current time HOOK : %u, %u", current_time.tv_sec, + g_info("New current time HOOK : %lu, %lu", current_time.tv_sec, current_time.tv_nsec); @@ -3114,11 +3013,8 @@ gint update_current_time_hook(void *hook_data, void *call_data) lttvwindow_report_time_window(control_flow_data->tab, new_time_window); } - //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); + gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); + return 0; } @@ -3164,37 +3060,24 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) process = lttv_state_find_process(tfs, process_info->pid); - if(process != NULL) { + if(unlikely(process != NULL)) { /* Only draw for processes that are currently in the trace states */ - guint y = 0, height = 0, pl_height = 0; ProcessList *process_list = control_flow_data->process_list; - LttTime birth = process_info->birth; - +#ifdef EXTRA_CHECK /* 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); - /* process HAS to be present */ - processlist_get_pixels_from_data(process_list, - hashed_process_data, - &y, - &height); +#endif //EXTRA_CHECK /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. */ - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); - - if(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0) + if(unlikely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0)) { TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -3213,14 +3096,14 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) /* Now create the drawing context that will be used to draw * items related to the last state. */ - draw_context.drawable = drawing->pixmap; + draw_context.drawable = hashed_process_data->pixmap; draw_context.gc = drawing->gc; draw_context.pango_layout = drawing->pango_layout; 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.y.over = 1; + draw_context.drawinfo.y.middle = (hashed_process_data->height/2); + draw_context.drawinfo.y.under = hashed_process_data->height; draw_context.drawinfo.start.offset.over = 0; draw_context.drawinfo.start.offset.middle = 0; @@ -3243,8 +3126,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) } #endif //0 - if(x == hashed_process_data->x.middle && - hashed_process_data->x.middle_used) { + if(unlikely(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 */ @@ -3264,7 +3147,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) draw_line((void*)&prop_line, (void*)&draw_context); /* become the last x position */ - if(x != hashed_process_data->x.middle) { + if(likely(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; @@ -3284,7 +3167,14 @@ int before_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; LttvTracesetState *tss = (LttvTracesetState*)call_data; - + ControlFlowData *cfd = (ControlFlowData*)events_request->viewer_data; +#if 0 + /* Desactivate sort */ + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(cfd->process_list->list_store), + TRACE_COLUMN, + GTK_SORT_ASCENDING); +#endif //0 drawing_chunk_begin(events_request, tss); return 0; @@ -3294,7 +3184,7 @@ int before_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; LttvTracesetState *tss = (LttvTracesetState*)call_data; - + drawing_data_request_begin(events_request, tss); return 0; @@ -3315,7 +3205,6 @@ 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 = (LttvTracesetState*)call_data; - LttvTracesetContext *tsc = (LttvTracesetContext*)call_data; ProcessList *process_list = control_flow_data->process_list; LttTime end_time = events_request->end_time; @@ -3338,6 +3227,7 @@ int after_request(void *hook_data, void *call_data) /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); + /* Request expose */ drawing_request_expose(events_request, tss, end_time); @@ -3385,8 +3275,18 @@ int after_chunk(void *hook_data, void *call_data) /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); - - /* Request expose */ +#if 0 + /* Reactivate sort */ + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(control_flow_data->process_list->list_store), + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, + GTK_SORT_ASCENDING); + + update_index_to_pixmap(control_flow_data->process_list); + /* Request a full expose : drawing scrambled */ + gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); +#endif //0 + /* Request expose (updates damages zone also) */ drawing_request_expose(events_request, tss, end_time); return 0;