X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=924f3711ba8660b2ba34c61559bddff37386e942;hb=a2aab3a3417958dbbb2dff69c15d1206ec7d28b1;hp=e1afc464b439606d3a0a0c7808116712ffdeeed1;hpb=fae7b8ee15af7d3c4eea352cea6f73a1c89a5ac0;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 e1afc464..924f3711 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -385,7 +385,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; @@ -393,11 +393,9 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttTime evtime = ltt_event_time(e); TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - - LttTime end_time = time_window.end_time; #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK guint width = drawing->width; @@ -428,6 +426,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) * be added after the state update. */ LttvProcessState *process; process = lttv_state_find_process(tfs, pid_out); + //process = tfs->process; if(process != NULL) { /* Well, the process_out existed : we must get it in the process hash @@ -451,6 +450,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) { g_assert(pid_out == 0 || pid_out != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid_out, process->last_cpu, @@ -459,15 +459,13 @@ int before_schedchange_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_out, - process->last_cpu, - &birth, - tfc->t_context->index, + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, &y, - &height, - &hashed_process_data); + &height); drawing_insert_square( drawing, y, height); } @@ -596,6 +594,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) { g_assert(pid_in == 0 || pid_in != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid_in, process->last_cpu, @@ -604,15 +603,13 @@ int before_schedchange_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_in, - process->last_cpu, - &birth, - tfc->t_context->index, + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, &y, - &height, - &hashed_process_data); + &height); drawing_insert_square( drawing, y, height); } @@ -732,11 +729,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(tab); - LttTime end_time = time_window.end_time; + LttTime time_window.end_time = time_window.time_window.end_time; //if(time < time_beg || time > time_end) return; if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) @@ -843,7 +840,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttTime time = ltt_event_time(e); - LttTime window_end = time_window.end_time; + LttTime window_end = time_window.time_window.end_time; convert_time_to_pixels( time_window, @@ -1341,7 +1338,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; @@ -1350,11 +1347,9 @@ int after_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; - #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK @@ -1399,6 +1394,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) &hashed_process_data_in) == 1) { g_assert(pid_in == 0 || pid_in != process_in->ppid); + ProcessInfo *process_info; /* Process not present */ processlist_add(process_list, pid_in, @@ -1408,15 +1404,13 @@ int after_schedchange_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data_in); - processlist_get_process_pixels(process_list, - pid_in, - process_in->last_cpu, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data_in, + &y_in, + &height); drawing_insert_square( control_flow_data->drawing, y_in, height); } @@ -1460,11 +1454,11 @@ int after_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; + LttTime time_window.end_time = time_window.time_window.end_time; //if(time < time_beg || time > time_end) return; if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; @@ -1573,7 +1567,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) //LttTime time = ltt_event_time(e); - //LttTime window_end = time_window->end_time; + //LttTime window_end = time_window->time_window.end_time; //convert_time_to_pixels( @@ -1954,7 +1948,7 @@ int before_execmode_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; @@ -1963,11 +1957,9 @@ int before_execmode_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; - #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK @@ -2003,6 +1995,7 @@ int before_execmode_hook(void *hook_data, void *call_data) &hashed_process_data) == 1) { g_assert(pid == 0 || pid != process->ppid); + ProcessInfo *process_info; /* Process not present */ processlist_add(process_list, pid, @@ -2012,15 +2005,13 @@ int before_execmode_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); drawing_insert_square( drawing, y, height); } @@ -2138,7 +2129,7 @@ int after_execmode_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; @@ -2147,11 +2138,9 @@ int after_execmode_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; - #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK @@ -2186,6 +2175,7 @@ int after_execmode_hook(void *hook_data, void *call_data) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid, process->last_cpu, @@ -2194,15 +2184,13 @@ int after_execmode_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); drawing_insert_square( control_flow_data->drawing, y, height); } @@ -2247,7 +2235,7 @@ int before_process_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; @@ -2256,11 +2244,9 @@ int before_process_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; - #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK @@ -2301,6 +2287,7 @@ int before_process_hook(void *hook_data, void *call_data) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid, process->last_cpu, @@ -2309,15 +2296,13 @@ int before_process_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); drawing_insert_square( control_flow_data->drawing, y, height); } @@ -2443,7 +2428,7 @@ int after_process_hook(void *hook_data, void *call_data) LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttvTraceState *ts =(LttvTraceState *)((LttvTracefileContext*)tfs)->t_context; LttEvent *e; e = tfc->e; @@ -2452,11 +2437,9 @@ int after_process_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; - #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK @@ -2503,6 +2486,7 @@ int after_process_hook(void *hook_data, void *call_data) { g_assert(child_pid == 0 || child_pid != process_child->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, child_pid, process_child->last_cpu, @@ -2511,15 +2495,13 @@ int after_process_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data_child); - processlist_get_process_pixels(process_list, - child_pid, - process_child->last_cpu, - &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data_child, + &y_child, + &height); drawing_insert_square( control_flow_data->drawing, y_child, height); } @@ -2578,6 +2560,7 @@ int after_process_hook(void *hook_data, void *call_data) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ + ProcessInfo *process_info; processlist_add(process_list, pid, process->last_cpu, @@ -2586,15 +2569,13 @@ int after_process_hook(void *hook_data, void *call_data) tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); + processlist_get_pixels_from_data(process_list, + process_info, + hashed_process_data, + &y, + &height); drawing_insert_square( control_flow_data->drawing, y, height); } @@ -3042,11 +3023,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = time_window.end_time; - #ifdef EXTRA_CHECK if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; #endif //EXTRA_CHECK @@ -3187,7 +3166,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) int before_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; drawing_chunk_begin(events_request, tss); @@ -3197,7 +3176,7 @@ int before_chunk(void *hook_data, void *call_data) int before_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; drawing_data_request_begin(events_request, tss); @@ -3218,8 +3197,8 @@ int after_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; + LttvTracesetContext *tsc = (LttvTracesetContext*)call_data; ProcessList *process_list = control_flow_data->process_list; LttTime end_time = events_request->end_time; @@ -3247,8 +3226,8 @@ int after_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; + LttvTracesetContext *tsc = (LttvTracesetContext*)call_data; LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc); LttTime end_time;