X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=9556d2dde030dabee402e868c3375615fb17a040;hb=d6fef8908a155b21de130fc4dc2b6b050080d153;hp=ce655eba0eca6796695228508cc54d3c28e5397f;hpb=8869ac083d37f2b2777ef64a25fddadf009e13dd;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 ce655eba..9556d2dd 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; @@ -380,20 +378,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. @@ -460,7 +454,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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. @@ -489,7 +483,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, @@ -519,7 +514,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, @@ -628,7 +624,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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 @@ -660,6 +656,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, @@ -687,6 +685,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( @@ -1381,15 +1381,12 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)((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; LttTime birth; @@ -1415,8 +1412,9 @@ 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; hashed_process_data_in = processlist_get_process_data(process_list, @@ -1465,7 +1463,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( @@ -1937,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; @@ -1992,18 +1991,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 @@ -2052,7 +2048,7 @@ int before_execmode_hook(void *hook_data, void *call_data) hashed_process_data, &y, &height); - drawing_insert_square( drawing, y, height); + drawing_insert_square( control_flow_data->drawing, y, height); } /* Set the current process */ process_list->current_hash_data[process->last_cpu_index] = @@ -2086,6 +2082,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, @@ -2114,6 +2112,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( @@ -2203,13 +2203,11 @@ int after_execmode_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; @@ -2280,8 +2278,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( @@ -2315,18 +2313,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; { @@ -2410,7 +2405,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, @@ -2439,7 +2435,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( @@ -2531,13 +2528,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; @@ -2614,7 +2609,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, @@ -2708,7 +2704,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, @@ -3141,13 +3138,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 */ @@ -3208,6 +3203,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_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(