X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=6c1e89f764d049400c9debf26d4213be9c57098f;hb=96947fcfd1323ffb5e9f2ac484adb4432b69e90c;hp=fc4e2caa4724518e1de10f5fb0c8a04a360af122;hpb=40debf7ba758820af936895254394591f139f732;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 fc4e2caa..6c1e89f7 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 @@ -236,7 +235,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, @@ -271,7 +269,7 @@ int event_selected_hook(void *hook_data, void *call_data) } /* Function that selects the color of status&exemode line */ -static __inline__ PropertiesLine prepare_s_e_line(LttvProcessState *process) +static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 2; @@ -318,7 +316,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; @@ -392,8 +390,6 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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. @@ -435,14 +431,12 @@ int before_schedchange_hook(void *hook_data, void *call_data) ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid_out, 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); @@ -464,7 +458,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) &height); drawing_insert_square( drawing, y, height); } - + /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. */ @@ -479,6 +473,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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 @@ -486,7 +485,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - + + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -503,14 +503,20 @@ 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 - + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -594,14 +600,12 @@ int before_schedchange_hook(void *hook_data, void *call_data) ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid_in, 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); @@ -641,6 +645,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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 @@ -648,6 +657,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -664,6 +674,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 @@ -671,6 +685,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint x; convert_time_to_pixels( @@ -1372,8 +1387,6 @@ int after_schedchange_hook(void *hook_data, void *call_data) 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; LttTime birth; @@ -1399,18 +1412,17 @@ int after_schedchange_hook(void *hook_data, void *call_data) //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; - if(processlist_get_process_pixels(process_list, + hashed_process_data_in = processlist_get_process_data(process_list, pid_in, 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); @@ -1439,6 +1451,10 @@ 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); @@ -1448,6 +1464,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) return; #endif //EXTRA_CHECK + guint width = control_flow_data->drawing->width; guint new_x; convert_time_to_pixels( @@ -1919,7 +1936,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; @@ -1985,7 +2002,6 @@ int before_execmode_hook(void *hook_data, void *call_data) 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 @@ -2008,19 +2024,13 @@ int before_execmode_hook(void *hook_data, void *call_data) if(process_list->current_hash_data[tfc->index] != NULL) { hashed_process_data = process_list->current_hash_data[tfc->index]; - processlist_get_pixels_from_data(process_list, - hashed_process_data, - &y, - &height); } else { - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid, 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 == 0 || pid != process->ppid); ProcessInfo *process_info; @@ -2062,6 +2072,10 @@ int before_execmode_hook(void *hook_data, void *call_data) 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); @@ -2070,6 +2084,7 @@ int before_execmode_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -2086,6 +2101,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); @@ -2094,6 +2113,7 @@ int before_execmode_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint x; convert_time_to_pixels( @@ -2171,6 +2191,12 @@ 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; @@ -2183,7 +2209,6 @@ int after_execmode_hook(void *hook_data, void *call_data) 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; @@ -2204,19 +2229,13 @@ int after_execmode_hook(void *hook_data, void *call_data) if(process_list->current_hash_data[tfc->index] != NULL) { hashed_process_data = process_list->current_hash_data[tfc->index]; - processlist_get_pixels_from_data(process_list, - hashed_process_data, - &y, - &height); } else { - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid, 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 == 0 || pid != process->ppid); /* Process not present */ @@ -2246,6 +2265,12 @@ int after_execmode_hook(void *hook_data, void *call_data) if(ltt_time_compare(hashed_process_data->next_good_time, evtime) <= 0) { +#if 0 + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2254,8 +2279,7 @@ int after_execmode_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK - - + guint width = control_flow_data->drawing->width; guint new_x; convert_time_to_pixels( @@ -2300,7 +2324,6 @@ int before_process_hook(void *hook_data, void *call_data) e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = control_flow_data->drawing->width; guint sub_id; { @@ -2327,38 +2350,34 @@ int before_process_hook(void *hook_data, void *call_data) if(process_list->current_hash_data[tfc->index] != NULL) { hashed_process_data = process_list->current_hash_data[tfc->index]; - processlist_get_pixels_from_data(process_list, - hashed_process_data, - &y, - &height); - } else if(processlist_get_process_pixels(process_list, + } else { + hashed_process_data = processlist_get_process_data(process_list, pid, process->last_cpu_index, &birth, + tfc->t_context->index); + if(hashed_process_data == NULL) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + const gchar *name = g_quark_to_string(process->name); + ProcessInfo *process_info; + processlist_add(process_list, + pid, + process->last_cpu_index, + process->ppid, + &birth, tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - 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, - 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); + 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. @@ -2376,6 +2395,10 @@ int before_process_hook(void *hook_data, void *call_data) 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); @@ -2385,6 +2408,7 @@ int before_process_hook(void *hook_data, void *call_data) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint x; convert_time_to_pixels( time_window, @@ -2401,15 +2425,19 @@ 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 - + guint width = drawing->width; guint x; convert_time_to_pixels( @@ -2497,6 +2525,7 @@ int after_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; @@ -2507,7 +2536,6 @@ int after_process_hook(void *hook_data, void *call_data) e = tfc->e; LttTime evtime = ltt_event_time(e); - guint width = control_flow_data->drawing->width; guint sub_id; guint param1; @@ -2538,14 +2566,12 @@ int after_process_hook(void *hook_data, void *call_data) birth = process_child->creation_time; - if(processlist_get_process_pixels(process_list, + hashed_process_data_child = processlist_get_process_data(process_list, child_pid, process_child->last_cpu_index, &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child) == 1) + tfc->t_context->index); + if(hashed_process_data_child == NULL) { g_assert(child_pid == 0 || child_pid != process_child->ppid); /* Process not present */ @@ -2572,6 +2598,12 @@ int after_process_hook(void *hook_data, void *call_data) if(ltt_time_compare(hashed_process_data_child->next_good_time, evtime) <= 0) { +#if 0 + processlist_get_pixels_from_data(process_list, + hashed_process_data_child, + &y_child, + &height); +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2581,6 +2613,7 @@ int after_process_hook(void *hook_data, void *call_data) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint new_x; convert_time_to_pixels( time_window, @@ -2623,20 +2656,13 @@ int after_process_hook(void *hook_data, void *call_data) if(process_list->current_hash_data[tfc->index] != NULL) { hashed_process_data = process_list->current_hash_data[tfc->index]; - processlist_get_pixels_from_data(process_list, - hashed_process_data, - &y, - &height); - } else { - if(processlist_get_process_pixels(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid, 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 == 0 || pid != process->ppid); /* Process not present */ @@ -2667,6 +2693,12 @@ int after_process_hook(void *hook_data, void *call_data) if(ltt_time_compare(hashed_process_data->next_good_time, evtime) <= 0) { +#if 0 + processlist_get_pixels_from_data(process_list, + hashed_process_data, + &y, + &height); +#endif //0 TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2676,6 +2708,7 @@ int after_process_hook(void *hook_data, void *call_data) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint new_x; convert_time_to_pixels( time_window, @@ -3114,7 +3147,6 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss; LttTime evtime = closure_data->end_time; - guint width = drawing->width; { /* For the process */ @@ -3175,6 +3207,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK + guint width = drawing->width; guint x; convert_time_to_pixels(