X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;ds=sidebyside;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=cdb7e14aad291e9b537c6b6b046dfa41146992bc;hb=0b74aa8307516c05e7f8d99a7df12384dcabc53d;hp=be23d1e38cd89fb834fb83f2ae481532c7ad131d;hpb=fd22065ba9587c58f9bcb4a9327383bc2484d950;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 be23d1e3..cdb7e14a 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -71,7 +71,6 @@ #include "cfv.h" #include "processlist.h" #include "drawing.h" -#include "cfv-private.h" #define MAX_PATH_LEN 256 @@ -142,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--; @@ -236,7 +233,6 @@ h_guicontrolflow(Tab *tab) control_flow_data->tab = tab; - //g_debug("time width2 : %u",time_window->time_width); // Unreg done in the GuiControlFlow_Destructor lttvwindow_register_traceset_notify(tab, traceset_notify, @@ -268,10 +264,11 @@ 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 */ -static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process) +static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 2; @@ -279,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]; @@ -318,7 +312,7 @@ static __inline PropertiesLine prepare_s_e_line(LttvProcessState *process) } #if 0 -static __inline PropertiesLine prepare_status_line(LttvProcessState *process) +static inline PropertiesLine prepare_status_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 2; @@ -380,20 +374,16 @@ int before_schedchange_hook(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - Drawing_t *drawing = control_flow_data->drawing; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = drawing->width; - /* we are in a schedchange, before the state update. We must draw the * items corresponding to the state before it changes : now is the right * time to do it. @@ -408,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); } { @@ -419,8 +408,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); - //process = tfs->process; + /* 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 @@ -431,23 +423,21 @@ int before_schedchange_hook(void *hook_data, void *call_data) HashedProcessData *hashed_process_data = NULL; 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, @@ -456,27 +446,25 @@ int before_schedchange_hook(void *hook_data, void *call_data) &process_info, &hashed_process_data); processlist_get_pixels_from_data(process_list, - process_info, hashed_process_data, &y, &height); - drawing_insert_square( drawing, y, height); + drawing_insert_square( control_flow_data->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. */ - /* 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 @@ -484,7 +472,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -501,14 +490,21 @@ int before_schedchange_hook(void *hook_data, void *call_data) hashed_process_data->x.middle_marked = TRUE; } } else { - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); + 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; + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -591,23 +587,21 @@ int before_schedchange_hook(void *hook_data, void *call_data) HashedProcessData *hashed_process_data = NULL; 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, @@ -616,28 +610,27 @@ int before_schedchange_hook(void *hook_data, void *call_data) &process_info, &hashed_process_data); processlist_get_pixels_from_data(process_list, - process_info, hashed_process_data, &y, &height); - drawing_insert_square( drawing, y, height); + drawing_insert_square( control_flow_data->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. */ - /* 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 @@ -645,6 +638,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -661,6 +656,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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 @@ -668,6 +667,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( @@ -900,7 +901,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); } @@ -1362,19 +1362,16 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = control_flow_data->drawing->width; - /* 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 y_in = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data_in = NULL; ProcessList *process_list = control_flow_data->process_list; @@ -1388,33 +1385,32 @@ 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); } /* 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. */ +#ifdef EXTRA_CHECK g_assert(process_in != NULL); - +#endif //EXTRA_CHECK 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, @@ -1423,16 +1419,22 @@ int after_schedchange_hook(void *hook_data, void *call_data) &process_info, &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); } + /* 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); @@ -1441,7 +1443,8 @@ int after_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint new_x; convert_time_to_pixels( @@ -1913,7 +1916,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) } #if 0 -static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) +static inline PropertiesLine prepare_execmode_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 1; @@ -1968,18 +1971,15 @@ int before_execmode_hook(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - Drawing_t *drawing = control_flow_data->drawing; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = drawing->width; /* we are in a execmode, before the state update. We must draw the * items corresponding to the state before it changes : now is the right @@ -1999,53 +1999,54 @@ int before_execmode_hook(void *hook_data, void *call_data) HashedProcessData *hashed_process_data = NULL; 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(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, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(unlikely(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); - ProcessInfo *process_info; - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &process_info, - &hashed_process_data); - processlist_get_pixels_from_data(process_list, - process_info, - hashed_process_data, - &y, - &height); - 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( control_flow_data->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. * 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) { + if(unlikely(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); @@ -2054,6 +2055,8 @@ int before_execmode_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -2070,6 +2073,10 @@ int before_execmode_hook(void *hook_data, void *call_data) 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); @@ -2078,6 +2085,8 @@ int before_execmode_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( @@ -2088,10 +2097,10 @@ 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, @@ -2155,19 +2164,23 @@ 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 *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = control_flow_data->drawing->width; /* Add process to process list (if not present) */ LttvProcessState *process; @@ -2185,41 +2198,51 @@ 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(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, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(unlikely(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(unlikely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0)) { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - ProcessInfo *process_info; - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &process_info, - &hashed_process_data); +#if 0 processlist_get_pixels_from_data(process_list, - process_info, hashed_process_data, &y, &height); - drawing_insert_square( control_flow_data->drawing, y, height); - } - - if(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0) - { +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2228,8 +2251,8 @@ int after_execmode_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint new_x; convert_time_to_pixels( @@ -2263,18 +2286,15 @@ int before_process_hook(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - Drawing_t *drawing = control_flow_data->drawing; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = control_flow_data->drawing->width; guint sub_id; { @@ -2298,53 +2318,51 @@ int before_process_hook(void *hook_data, void *call_data) 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(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, pid, - process->last_cpu, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(unlikely(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_index, + process->ppid, &birth, tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - ProcessInfo *process_info; - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &process_info, - &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); + 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. * 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) { + if(unlikely(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); @@ -2353,7 +2371,8 @@ int before_process_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -2370,15 +2389,20 @@ int before_process_hook(void *hook_data, void *call_data) hashed_process_data->x.middle_marked = TRUE; } } else { - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); + 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; + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint x; convert_time_to_pixels( @@ -2389,10 +2413,10 @@ 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, @@ -2470,13 +2494,11 @@ int after_process_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = control_flow_data->drawing->width; guint sub_id; guint param1; @@ -2506,23 +2528,21 @@ 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(likely(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, @@ -2531,16 +2551,22 @@ int after_process_hook(void *hook_data, void *call_data) &process_info, &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); } - 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); @@ -2549,7 +2575,8 @@ int after_process_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint new_x; convert_time_to_pixels( time_window, @@ -2557,17 +2584,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; @@ -2589,41 +2616,52 @@ int after_process_hook(void *hook_data, void *call_data) 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(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, + pid, + process->last_cpu_index, + &birth, + tfc->t_context->index); + if(unlikely(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(unlikely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0)) { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - ProcessInfo *process_info; - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &process_info, - &hashed_process_data); +#if 0 processlist_get_pixels_from_data(process_list, - process_info, hashed_process_data, &y, &height); - drawing_insert_square( control_flow_data->drawing, y, height); - } - - if(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0) - { +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2632,14 +2670,15 @@ int after_process_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; guint new_x; convert_time_to_pixels( time_window, 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; @@ -2677,13 +2716,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, @@ -2739,11 +2778,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) 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); + 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, @@ -2792,10 +2831,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) 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); + 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. */ @@ -2821,10 +2861,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->width+SAFETY, // 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); + //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; @@ -2849,10 +2890,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->width+SAFETY, // 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); + //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; @@ -2873,7 +2915,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); @@ -2881,24 +2922,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; } @@ -2935,10 +2958,11 @@ gint redraw_notify(void *hook_data, void *call_data) drawing->height); } - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); + //gtk_widget_queue_draw_area(drawing->drawing_area, + // 0,0, + // drawing->width, + // drawing->height); return FALSE; } @@ -2948,7 +2972,6 @@ 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); @@ -2992,7 +3015,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); @@ -3041,11 +3064,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; } @@ -3054,6 +3074,7 @@ typedef struct _ClosureData { EventsRequest *events_request; LttvTracesetState *tss; LttTime end_time; + guint x_end; } ClosureData; @@ -3065,13 +3086,11 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) EventsRequest *events_request = closure_data->events_request; ControlFlowData *control_flow_data = events_request->viewer_data; - Drawing_t *drawing = control_flow_data->drawing; LttvTracesetState *tss = closure_data->tss; - LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss; + LttvTracesetContext *tsc = (LttvTracesetContext*)tss; LttTime evtime = closure_data->end_time; - guint width = drawing->width; { /* For the process */ @@ -3080,8 +3099,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 = @@ -3091,23 +3111,20 @@ 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; + guint y = 0, 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); - const gchar *name = g_quark_to_string(process->name); - +#endif //EXTRA_CHECK /* process HAS to be present */ processlist_get_pixels_from_data(process_list, - process_info, hashed_process_data, &y, &height); @@ -3116,15 +3133,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_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(unlikely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0)) { TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -3134,13 +3144,10 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - guint x; + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; - convert_time_to_pixels( - time_window, - evtime, - width, - &x); + guint x = closure_data->x_end; DrawContext draw_context; @@ -3176,8 +3183,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 */ @@ -3197,7 +3204,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; @@ -3248,7 +3255,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; @@ -3258,6 +3264,16 @@ int after_request(void *hook_data, void *call_data) closure_data.tss = tss; closure_data.end_time = end_time; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + guint width = control_flow_data->drawing->width; + convert_time_to_pixels( + time_window, + end_time, + width, + &closure_data.x_end); + + /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); @@ -3283,6 +3299,9 @@ int after_chunk(void *hook_data, void *call_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 */ @@ -3293,6 +3312,15 @@ int after_chunk(void *hook_data, void *call_data) closure_data.tss = tss; closure_data.end_time = end_time; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + guint width = control_flow_data->drawing->width; + convert_time_to_pixels( + time_window, + end_time, + width, + &closure_data.x_end); + /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data);