X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=17498ae537412523ee1ebbf8a882bc138c14a8c9;hb=a43d67bae425508678e5ae2ffe5dd1e84286b915;hp=8a5c6b9ad8262fe07eacd03a9928b4cba83b4515;hpb=d0cd7f0949c2fd90d5a39361b192c9b2d96bf5d4;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 8a5c6b9a..17498ae5 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 ; @@ -148,18 +132,19 @@ int draw_event_hook(void *hook_data, void *call_data) { EventRequest *event_request = (EventRequest*)hook_data; ControlFlowData *control_flow_data = event_request->control_flow_data; + MainWindow *mw = control_flow_data->mw; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - + LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; 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(mw); LttTime end_time = ltt_time_add(time_window->start_time, time_window->time_width); @@ -170,7 +155,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 +174,14 @@ 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(tfs, pid_out); - g_critical("out : %s",g_quark_to_string(process_out->state->s)); - + if(process_out == NULL) return 0; + 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)); HashedProcessData *hashed_process_data_out = NULL; @@ -230,7 +216,8 @@ int draw_event_hook(void *hook_data, void *call_data) /* Find process pid_in in the list... */ process_in = lttv_state_find_process(tfs, pid_in); - g_critical("in : %s",g_quark_to_string(process_in->state->s)); + if(process_in == NULL) return 0; + 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)); @@ -272,12 +259,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, @@ -309,7 +296,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; @@ -360,7 +347,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); @@ -449,7 +436,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) @@ -524,7 +511,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; @@ -592,7 +579,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) { @@ -749,14 +736,15 @@ int draw_after_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; LttEvent *e; 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); @@ -768,7 +756,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 */ @@ -787,12 +775,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(tfs, pid_out); - //g_critical("out : %s",g_quark_to_string(process_out->state->s)); + if(process_out == NULL) return 0; + //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)); @@ -828,7 +817,8 @@ int draw_after_hook(void *hook_data, void *call_data) /* Find process pid_in in the list... */ process_in = lttv_state_find_process(tfs, pid_in); - //g_critical("in : %s",g_quark_to_string(process_in->state->s)); + if(process_in == NULL) return 0; + //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)); @@ -870,12 +860,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, @@ -1197,9 +1187,15 @@ 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; + Drawing_t *drawing = control_flow_data->drawing; + + 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, @@ -1261,14 +1257,6 @@ gint update_time_window_hook(void *hook_data, void *call_data) 0, 0, -1, -1); - convert_time_to_pixels( - *ns, - new_end, - old_end, - width, - &x); - - *old_time_window = *new_time_window; /* Clear the data request background, but not SAFETY */ gdk_draw_rectangle (control_flow_data->drawing->pixmap, control_flow_data->drawing->drawing_area->style->black_gc, @@ -1276,6 +1264,12 @@ gint update_time_window_hook(void *hook_data, void *call_data) x+SAFETY, 0, control_flow_data->drawing->width - x, // do not overlap control_flow_data->drawing->height+SAFETY); + + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width - x, + control_flow_data->drawing->height); + /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, &control_flow_data->drawing->pixmap, @@ -1283,12 +1277,6 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->width - x, control_flow_data->drawing->height); - drawing_refresh(control_flow_data->drawing, - 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); - - } else { //if(nsdrawing->height+SAFETY); + + gtk_widget_queue_draw_area (drawing->drawing_area, + x,0, + control_flow_data->drawing->width - x, + control_flow_data->drawing->height); + /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, &control_flow_data->drawing->pixmap, @@ -1331,42 +1325,40 @@ gint update_time_window_hook(void *hook_data, void *call_data) x, control_flow_data->drawing->height); - drawing_refresh(control_flow_data->drawing, - 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); - } else { - g_info("scrolling far"); - /* Cannot reuse any part of the screen : far jump */ - *old_time_window = *new_time_window; - - - gdk_draw_rectangle (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->black_gc, - TRUE, - 0, 0, - control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height+SAFETY); - - drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, - 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); - - drawing_refresh(control_flow_data->drawing, + if(ltt_time_compare(*ns,*os) == 0) + { + g_info("not scrolling"); + } else { + g_info("scrolling far"); + /* Cannot reuse any part of the screen : far jump */ + + + gdk_draw_rectangle (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->black_gc, + TRUE, 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + control_flow_data->drawing->width+SAFETY, // do not overlap + control_flow_data->drawing->height+SAFETY); + + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + + drawing_data_request(control_flow_data->drawing, + &control_flow_data->drawing->pixmap, + 0, 0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + + } } } } else { /* Different scale (zoom) */ g_info("zoom"); - *old_time_window = *new_time_window; - gdk_draw_rectangle (control_flow_data->drawing->pixmap, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, @@ -1374,6 +1366,10 @@ 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+SAFETY); + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); drawing_data_request(control_flow_data->drawing, &control_flow_data->drawing->pixmap, @@ -1381,10 +1377,6 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->width, control_flow_data->drawing->height); - drawing_refresh(control_flow_data->drawing, - 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); } @@ -1392,29 +1384,41 @@ gint update_time_window_hook(void *hook_data, void *call_data) return 0; } +gint after_process_traceset_hook(void *hook_data, void *call_data) +{ + ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + TimeRequest *time_request = (TimeRequest *)call_data; + + drawing_data_request_end(control_flow_data->drawing, + time_request->time_window); + return 0; +} + + + gint update_current_time_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*)hook_data; + Drawing_t *drawing = control_flow_data->drawing; - 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); @@ -1428,33 +1432,41 @@ 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); + //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); + gtk_widget_queue_draw_area(drawing->drawing_area, + 0,0, + drawing->width, + drawing->height); return 0; } @@ -1492,7 +1504,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; @@ -1501,7 +1515,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; @@ -1519,7 +1533,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context->gc, widget->style->black_gc); - if(process->state->s == LTTV_STATE_RUN) + if(process != NULL && process->state->s == LTTV_STATE_RUN) { PropertiesBG prop_bg; prop_bg.color = g_new(GdkColor,1); @@ -1552,7 +1566,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); @@ -1566,47 +1580,57 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) prop_line.position = MIDDLE; /* color of line : status of the process */ - if(process->state->s == LTTV_STATE_UNNAMED) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xffff; - } - else if(process->state->s == LTTV_STATE_WAIT_FORK) + if(process != NULL) { - prop_line.color->red = 0x0fff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xfff0; - } - else if(process->state->s == LTTV_STATE_WAIT_CPU) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0x0000; - } - else if(process->state->s == LTTV_STATE_EXIT) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0xffff; - } - else if(process->state->s == LTTV_STATE_WAIT) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0x0000; - } - else if(process->state->s == LTTV_STATE_RUN) - { - prop_line.color->red = 0x0000; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0x0000; + if(process->state->s == LTTV_STATE_UNNAMED) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; + } + else if(process->state->s == LTTV_STATE_WAIT_FORK) + { + prop_line.color->red = 0x0fff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xfff0; + } + else if(process->state->s == LTTV_STATE_WAIT_CPU) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0x0000; + } + else if(process->state->s == LTTV_STATE_EXIT) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0x0000; + prop_line.color->blue = 0xffff; + } + else if(process->state->s == LTTV_STATE_WAIT) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0x0000; + prop_line.color->blue = 0x0000; + } + else if(process->state->s == LTTV_STATE_RUN) + { + prop_line.color->red = 0x0000; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0x0000; + } + else + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; + } + } else { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xffff; + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; } draw_line((void*)&prop_line, (void*)draw_context); @@ -1652,6 +1676,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) * for each process * draw closing line * new default prev and current + * then finally remove reading hooks. */ int after_data_request(void *hook_data, void *call_data) { @@ -1667,6 +1692,10 @@ int after_data_request(void *hook_data, void *call_data) g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); + + /* Remove reading hooks */ + // Cannot do this here, will break processtrace! + //drawing_data_request_end(control_flow_data->drawing); }