X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=1fb3f1ec5c812959c7a8e1fe64598524ec946b7d;hb=224446ce9bb1b6724122cfdf4e3e716a5526af24;hp=ea127809337cc748c5cad167a36c9a7521c819f9;hpb=1aff52a2d01b41c9944a69b795ed1a2670d8c40e;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 ea127809..1fb3f1ec 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -22,9 +22,6 @@ *****************************************************************************/ -#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) -#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) - //#define PANGO_ENABLE_BACKEND #include #include @@ -39,10 +36,11 @@ #include #include +#include #include -#include +#include #include -#include +#include #include "eventhooks.h" @@ -70,29 +68,15 @@ h_guicontrolflow(MainWindow *mw, LttvTracesetSelector * s, char * key) ControlFlowData *control_flow_data = guicontrolflow() ; control_flow_data->mw = mw; - TimeWindow *time_window = guicontrolflow_get_time_window(control_flow_data); - time_window->start_time.tv_sec = 0; - time_window->start_time.tv_nsec = 0; - time_window->time_width.tv_sec = 0; - time_window->time_width.tv_nsec = 0; - - LttTime *current_time = guicontrolflow_get_current_time(control_flow_data); - current_time->tv_sec = 0; - current_time->tv_nsec = 0; - - //g_critical("time width1 : %u",time_window->time_width); - get_time_window(mw, - time_window); - get_current_time(mw, - current_time); - - //g_critical("time width2 : %u",time_window->time_width); + //g_debug("time width2 : %u",time_window->time_width); // Unreg done in the GuiControlFlow_Destructor - reg_update_time_window(update_time_window_hook, control_flow_data, - mw); - reg_update_current_time(update_current_time_hook, control_flow_data, - mw); + lttvwindow_register_time_window_notify(mw, + update_time_window_hook, + control_flow_data); + lttvwindow_register_current_time_notify(mw, + update_current_time_hook, + control_flow_data); return guicontrolflow_get_widget(control_flow_data) ; } @@ -102,7 +86,7 @@ int event_selected_hook(void *hook_data, void *call_data) ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; guint *event_number = (guint*) call_data; - g_critical("DEBUG : event selected by main window : %u", *event_number); + g_debug("DEBUG : event selected by main window : %u", *event_number); // control_flow_data->currently_Selected_Event = *event_number; // control_flow_data->Selected_Event = TRUE ; @@ -158,8 +142,8 @@ int draw_event_hook(void *hook_data, void *call_data) e = tfc->e; LttTime evtime = ltt_event_time(e); - TimeWindow *time_window = - guicontrolflow_get_time_window(control_flow_data); + const TimeWindow *time_window = + lttvwindow_get_time_window(control_flow_data->mw); LttTime end_time = ltt_time_add(time_window->start_time, time_window->time_width); @@ -170,7 +154,7 @@ int draw_event_hook(void *hook_data, void *call_data) if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { - g_critical("schedchange!"); + g_debug("schedchange!"); /* Add process to process list (if not present) and get drawing "y" from * process position */ @@ -189,13 +173,13 @@ int draw_event_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_critical("out : %u in : %u", pid_out, pid_in); + g_debug("out : %u in : %u", pid_out, pid_in); /* Find process pid_out in the list... */ - process_out = lttv_state_find_process_from_trace(ts, pid_out); + process_out = lttv_state_find_process(tfs, pid_out); if(process_out == NULL) return 0; - g_critical("out : %s",g_quark_to_string(process_out->state->s)); + g_debug("out : %s",g_quark_to_string(process_out->state->s)); birth = process_out->creation_time; gchar *name = strdup(g_quark_to_string(process_out->name)); @@ -230,9 +214,9 @@ int draw_event_hook(void *hook_data, void *call_data) g_free(name); /* Find process pid_in in the list... */ - process_in = lttv_state_find_process_from_trace(ts, pid_in); + process_in = lttv_state_find_process(tfs, pid_in); if(process_in == NULL) return 0; - g_critical("in : %s",g_quark_to_string(process_in->state->s)); + g_debug("in : %s",g_quark_to_string(process_in->state->s)); birth = process_in->creation_time; name = strdup(g_quark_to_string(process_in->name)); @@ -274,12 +258,12 @@ int draw_event_hook(void *hook_data, void *call_data) LttTime time = ltt_event_time(e); - LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width, - control_flow_data->time_window.start_time); + LttTime window_end = ltt_time_add(time_window->time_width, + time_window->start_time); convert_time_to_pixels( - control_flow_data->time_window.start_time, + time_window->start_time, window_end, time, width, @@ -311,7 +295,7 @@ int draw_event_hook(void *hook_data, void *call_data) draw_context_out->previous->middle->x = event_request->x_begin; draw_context_out->previous->under->x = event_request->x_begin; - g_critical("out middle x_beg : %u",event_request->x_begin); + g_debug("out middle x_beg : %u",event_request->x_begin); } draw_context_out->current->middle->x = x; @@ -362,7 +346,7 @@ int draw_event_hook(void *hook_data, void *call_data) prop_bg.color->blue = 0xe7e7; } - g_critical("calling from draw_event"); + g_debug("calling from draw_event"); draw_bg((void*)&prop_bg, (void*)draw_context_out); g_free(prop_bg.color); gdk_gc_unref(draw_context_out->gc); @@ -451,7 +435,7 @@ int draw_event_hook(void *hook_data, void *call_data) prop_line_out.style = GDK_LINE_SOLID; prop_line_out.position = MIDDLE; - g_critical("out state : %s", g_quark_to_string(process_out->state->s)); + g_debug("out state : %s", g_quark_to_string(process_out->state->s)); /* color of line : status of the process */ if(process_out->state->s == LTTV_STATE_UNNAMED) @@ -526,7 +510,7 @@ int draw_event_hook(void *hook_data, void *call_data) draw_context_in->previous->middle->x = event_request->x_begin; draw_context_in->previous->over->x = event_request->x_begin; draw_context_in->previous->under->x = event_request->x_begin; - g_critical("in middle x_beg : %u",event_request->x_begin); + g_debug("in middle x_beg : %u",event_request->x_begin); } draw_context_in->current->middle->x = x; @@ -594,7 +578,7 @@ int draw_event_hook(void *hook_data, void *call_data) prop_text_in.size = 6; prop_text_in.position = OVER; - g_critical("in state : %s", g_quark_to_string(process_in->state->s)); + g_debug("in state : %s", g_quark_to_string(process_in->state->s)); /* foreground of text : status of the process */ if(process_in->state->s == LTTV_STATE_UNNAMED) { @@ -758,8 +742,8 @@ int draw_after_hook(void *hook_data, void *call_data) e = tfc->e; LttTime evtime = ltt_event_time(e); - TimeWindow *time_window = - guicontrolflow_get_time_window(control_flow_data); + const TimeWindow *time_window = + lttvwindow_get_time_window(control_flow_data->mw); LttTime end_time = ltt_time_add(time_window->start_time, time_window->time_width); @@ -771,7 +755,7 @@ int draw_after_hook(void *hook_data, void *call_data) if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { - g_critical("schedchange!"); + g_debug("schedchange!"); /* Add process to process list (if not present) and get drawing "y" from * process position */ @@ -790,13 +774,13 @@ int draw_after_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_critical("out : %u in : %u", pid_out, pid_in); + //g_debug("out : %u in : %u", pid_out, pid_in); /* Find process pid_out in the list... */ - process_out = lttv_state_find_process_from_trace(ts, pid_out); + process_out = lttv_state_find_process(tfs, pid_out); if(process_out == NULL) return 0; - //g_critical("out : %s",g_quark_to_string(process_out->state->s)); + //g_debug("out : %s",g_quark_to_string(process_out->state->s)); birth = process_out->creation_time; gchar *name = strdup(g_quark_to_string(process_out->name)); @@ -831,9 +815,9 @@ int draw_after_hook(void *hook_data, void *call_data) g_free(name); /* Find process pid_in in the list... */ - process_in = lttv_state_find_process_from_trace(ts, pid_in); + process_in = lttv_state_find_process(tfs, pid_in); if(process_in == NULL) return 0; - //g_critical("in : %s",g_quark_to_string(process_in->state->s)); + //g_debug("in : %s",g_quark_to_string(process_in->state->s)); birth = process_in->creation_time; name = strdup(g_quark_to_string(process_in->name)); @@ -875,12 +859,12 @@ int draw_after_hook(void *hook_data, void *call_data) //LttTime time = ltt_event_time(e); - //LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width, - // control_flow_data->time_window.start_time); + //LttTime window_end = ltt_time_add(time_window->time_width, + // time_window->start_time); //convert_time_to_pixels( - // control_flow_data->time_window.start_time, + // time_window->start_time, // window_end, // time, // width, @@ -1202,9 +1186,13 @@ int draw_after_hook(void *hook_data, void *call_data) gint update_time_window_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + const TimeWindowNotifyData *time_window_nofify_data = + ((const TimeWindowNotifyData *)call_data); + TimeWindow *old_time_window = - guicontrolflow_get_time_window(control_flow_data); - TimeWindow *new_time_window = ((TimeWindow*)call_data); + time_window_nofify_data->old_time_window; + TimeWindow *new_time_window = + time_window_nofify_data->new_time_window; /* Update the ruler */ drawing_update_ruler(control_flow_data->drawing, @@ -1320,7 +1308,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) x, 0, -1, -1); - *old_time_window = *new_time_window; + //*old_time_window = *new_time_window; /* Clean the data request background */ gdk_draw_rectangle (control_flow_data->drawing->pixmap, @@ -1344,7 +1332,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) } else { g_info("scrolling far"); /* Cannot reuse any part of the screen : far jump */ - *old_time_window = *new_time_window; + //*old_time_window = *new_time_window; gdk_draw_rectangle (control_flow_data->drawing->pixmap, @@ -1370,7 +1358,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Different scale (zoom) */ g_info("zoom"); - *old_time_window = *new_time_window; + //*old_time_window = *new_time_window; gdk_draw_rectangle (control_flow_data->drawing->pixmap, control_flow_data->drawing->drawing_area->style->black_gc, @@ -1401,25 +1389,24 @@ gint update_current_time_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*)hook_data; - LttTime* current_time = - guicontrolflow_get_current_time(control_flow_data); - *current_time = *((LttTime*)call_data); + LttTime current_time = *((LttTime*)call_data); - TimeWindow time_window; + const TimeWindow *time_window = + lttvwindow_get_time_window(control_flow_data->mw); - LttTime time_begin = control_flow_data->time_window.start_time; - LttTime width = control_flow_data->time_window.time_width; + LttTime time_begin = time_window->start_time; + LttTime width = time_window->time_width; LttTime half_width = ltt_time_div(width,2.0); LttTime time_end = ltt_time_add(time_begin, width); LttvTracesetContext * tsc = - get_traceset_context(control_flow_data->mw); + lttvwindow_get_traceset_context(control_flow_data->mw); LttTime trace_start = tsc->Time_Span->startTime; LttTime trace_end = tsc->Time_Span->endTime; - g_info("New current time HOOK : %u, %u", current_time->tv_sec, - current_time->tv_nsec); + g_info("New current time HOOK : %u, %u", current_time.tv_sec, + current_time.tv_nsec); @@ -1433,30 +1420,34 @@ gint update_current_time_hook(void *hook_data, void *call_data) * at one end of the trace. */ - if(ltt_time_compare(*current_time, time_begin) == -1) + if(ltt_time_compare(current_time, time_begin) == -1) { - if(ltt_time_compare(*current_time, + TimeWindow new_time_window; + + if(ltt_time_compare(current_time, ltt_time_add(trace_start,half_width)) == -1) time_begin = trace_start; else - time_begin = ltt_time_sub(*current_time,half_width); + time_begin = ltt_time_sub(current_time,half_width); - time_window.start_time = time_begin; - time_window.time_width = width; + new_time_window.start_time = time_begin; + new_time_window.time_width = width; - set_time_window(control_flow_data->mw, &time_window); + lttvwindow_report_time_window(control_flow_data->mw, &new_time_window); } - else if(ltt_time_compare(*current_time, time_end) == 1) + else if(ltt_time_compare(current_time, time_end) == 1) { - if(ltt_time_compare(*current_time, ltt_time_sub(trace_end, half_width)) == 1) + TimeWindow new_time_window; + + if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) == 1) time_begin = ltt_time_sub(trace_end,width); else - time_begin = ltt_time_sub(*current_time,half_width); + time_begin = ltt_time_sub(current_time,half_width); - time_window.start_time = time_begin; - time_window.time_width = width; + new_time_window.start_time = time_begin; + new_time_window.time_width = width; - set_time_window(control_flow_data->mw, &time_window); + lttvwindow_report_time_window(control_flow_data->mw, &new_time_window); } gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); @@ -1497,7 +1488,9 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) LttvTraceState *ts = (LttvTraceState*)tc; LttvProcessState *process; - process = lttv_state_find_process_from_trace(ts, process_info->pid); + /* We do not provide a cpu_name argument assuming that this is not the + idle job (pid 0) and thus its pid is unique across all cpus */ + process = lttv_state_find_process_from_trace(ts, 0, process_info->pid); /* Draw the closing line */ DrawContext *draw_context = hashed_process_data->draw_context; @@ -1506,7 +1499,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) draw_context->previous->middle->x = closure_data->event_request->x_begin; draw_context->previous->over->x = closure_data->event_request->x_begin; draw_context->previous->under->x = closure_data->event_request->x_begin; - g_critical("out middle x_beg : %u",closure_data->event_request->x_begin); + g_debug("out middle x_beg : %u",closure_data->event_request->x_begin); } draw_context->current->middle->x = closure_data->event_request->x_end; @@ -1557,7 +1550,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) } */ - g_critical("calling from closure"); + g_debug("calling from closure"); //FIXME : I need the cpu number in process's state to draw this. //draw_bg((void*)&prop_bg, (void*)draw_context); g_free(prop_bg.color);