X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2FguiControlFlow%2FEvent_Hooks.c;h=0a103d6699345c5469a0b59fc3f4714714352205;hb=34b048821159dd48a9c5eac32ad5333925da334d;hp=ae3db90187f7499ef78a1df08ea9a0a64b642c47;hpb=9f967db4d1b31323f7da107d74cf9623c3a6081b;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c index ae3db901..0a103d66 100644 --- a/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c +++ b/ltt/branches/poly/lttv/modules/guiControlFlow/Event_Hooks.c @@ -15,6 +15,7 @@ //#include #include +#include #include #include @@ -531,6 +532,7 @@ int draw_event_hook(void *hook_data, void *call_data) * process position */ guint pid = tfs->process->pid; LttTime birth = tfs->process->creation_time; + gchar *name = strdup("name"); guint y = 0, height = 0, pl_height = 0; HashedProcessData *Hashed_Process_Data = NULL; @@ -548,8 +550,10 @@ int draw_event_hook(void *hook_data, void *call_data) processlist_add(process_list, pid, &birth, + name, &pl_height, &Hashed_Process_Data); + g_free(name); drawing_insert_square( Event_Request->Control_Flow_Data->Drawing, y, height); } @@ -581,16 +585,45 @@ int draw_event_hook(void *hook_data, void *call_data) prop_arc.size = 10; prop_arc.filled = TRUE; prop_arc.position = OVER; + DrawContext *draw_context = Hashed_Process_Data->draw_context; draw_context->Current->modify_over->x = x; draw_context->Current->modify_over->y = y; draw_context->drawable = control_flow_data->Drawing->Pixmap; + draw_context->pango_layout = control_flow_data->Drawing->pango_layout; GtkWidget *widget = control_flow_data->Drawing->Drawing_Area_V; //draw_context->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; draw_context->gc = widget->style->black_gc; - draw_arc((void*)&prop_arc, (void*)draw_context); + //draw_arc((void*)&prop_arc, (void*)draw_context); //test_draw_item(control_flow_data->Drawing, control_flow_data->Drawing->Pixmap); + + GdkColor colorfg = { 0, 0x0000, 0x0000, 0x0000 }; + GdkColor colorbg = { 0, 0xffff, 0x0000, 0xffff }; + PropertiesText prop_text; + prop_text.foreground = &colorfg; + prop_text.background = &colorbg; + prop_text.size = 10; + prop_text.position = OVER; + + /* Print status of the process : U, WF, WC, E, W, R */ + if(tfs->process->state->s == LTTV_STATE_UNNAMED) + prop_text.Text = "U"; + else if(tfs->process->state->s == LTTV_STATE_WAIT_FORK) + prop_text.Text = "WF"; + else if(tfs->process->state->s == LTTV_STATE_WAIT_CPU) + prop_text.Text = "WC"; + else if(tfs->process->state->s == LTTV_STATE_EXIT) + prop_text.Text = "E"; + else if(tfs->process->state->s == LTTV_STATE_WAIT) + prop_text.Text = "W"; + else if(tfs->process->state->s == LTTV_STATE_RUN) + prop_text.Text = "R"; + else + prop_text.Text = "U"; + + draw_text((void*)&prop_text, (void*)draw_context); + return 0; } @@ -608,34 +641,193 @@ int draw_after_hook(void *hook_data, void *call_data) void update_time_window_hook(void *hook_data, void *call_data) { - ControlFlowData *Control_Flow_Data = (ControlFlowData*) hook_data; - TimeWindow* Time_Window = - guicontrolflow_get_time_window(Control_Flow_Data); + ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + TimeWindow *Old_Time_Window = + guicontrolflow_get_time_window(control_flow_data); TimeWindow *New_Time_Window = ((TimeWindow*)call_data); - - // As the time interval change will mostly be used for - // zoom in and out, it's not useful to keep old drawing - // sections, as scale will be changed. + /* Two cases : zoom in/out or scrolling */ + + /* In order to make sure we can reuse the old drawing, the scale must + * be the same and the new time interval being partly located in the + * currently shown time interval. (reuse is only for scrolling) + */ + + g_info("Old time window HOOK : %u, %u to %u, %u", + Old_Time_Window->start_time.tv_sec, + Old_Time_Window->start_time.tv_nsec, + Old_Time_Window->time_width.tv_sec, + Old_Time_Window->time_width.tv_nsec); - *Time_Window = *New_Time_Window; g_info("New time window HOOK : %u, %u to %u, %u", - Time_Window->start_time.tv_sec, - Time_Window->start_time.tv_nsec, - Time_Window->time_width.tv_sec, - Time_Window->time_width.tv_nsec); - - 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, - 0, 0, - Control_Flow_Data->Drawing->width, - Control_Flow_Data->Drawing->height); + New_Time_Window->start_time.tv_sec, + New_Time_Window->start_time.tv_nsec, + New_Time_Window->time_width.tv_sec, + New_Time_Window->time_width.tv_nsec); + + if( New_Time_Window->time_width.tv_sec == Old_Time_Window->time_width.tv_sec + && New_Time_Window->time_width.tv_nsec == Old_Time_Window->time_width.tv_nsec) + { + /* Same scale (scrolling) */ + g_info("scrolling"); + LttTime *ns = &New_Time_Window->start_time; + LttTime *os = &Old_Time_Window->start_time; + LttTime old_end = ltt_time_add(Old_Time_Window->start_time, + Old_Time_Window->time_width); + LttTime new_end = ltt_time_add(New_Time_Window->start_time, + New_Time_Window->time_width); + //if(nsDrawing->Drawing_Area_V->allocation.width; + convert_time_to_pixels( + *os, + old_end, + *ns, + width, + &x); + + /* Copy old data to new location */ + gdk_draw_drawable (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + control_flow_data->Drawing->Pixmap, + x, 0, + 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_V->style->white_gc, + TRUE, + x+SAFETY, 0, + control_flow_data->Drawing->width - x, // do not overlap + control_flow_data->Drawing->height+SAFETY); + /* Get new data for the rest. */ + drawing_data_request(control_flow_data->Drawing, + &control_flow_data->Drawing->Pixmap, + x, 0, + 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->Drawing_Area_V->allocation.width; + convert_time_to_pixels( + *ns, + new_end, + *os, + width, + &x); + + /* Copy old data to new location */ + gdk_draw_drawable (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + control_flow_data->Drawing->Pixmap, + 0, 0, + x, 0, + -1, -1); + + *Old_Time_Window = *New_Time_Window; + + /* Clean the data request background */ + gdk_draw_rectangle (control_flow_data->Drawing->Pixmap, + control_flow_data->Drawing->Drawing_Area_V->style->white_gc, + TRUE, + 0, 0, + x, // do not overlap + control_flow_data->Drawing->height+SAFETY); + /* Get new data for the rest. */ + drawing_data_request(control_flow_data->Drawing, + &control_flow_data->Drawing->Pixmap, + 0, 0, + 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_V->style->white_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, + 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_V->style->white_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, + 0, 0, + control_flow_data->Drawing->width, + control_flow_data->Drawing->height); + } + } void update_current_time_hook(void *hook_data, void *call_data)