X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=3b779352201c0e31f9be48f65084cbde8c813c6b;hb=10a1069a786aebb338aee5a31c1e3e17198aacbb;hp=cb1121acd7fb77a91d0e2ddbd43a119c3c655711;hpb=b9a010a28d9625c9d31968aa44f1a553daccb294;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 cb1121ac..3b779352 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -25,19 +25,19 @@ /* Event hooks are the drawing hooks called during traceset read. They draw the * icons, text, lines and background color corresponding to the events read. * - * Two hooks are used for drawing : draw_before and draw_after hooks. The - * draw_before is called before the state update that occurs with an event and - * the draw_after hook is called after this state update. + * Two hooks are used for drawing : before_schedchange and after_schedchange hooks. The + * before_schedchange is called before the state update that occurs with an event and + * the after_schedchange hook is called after this state update. * - * The draw_before hooks fulfill the task of drawing the visible objects that - * corresponds to the data accumulated by the draw_after hook. + * The before_schedchange hooks fulfill the task of drawing the visible objects that + * corresponds to the data accumulated by the after_schedchange hook. * - * The draw_after hook accumulates the data that need to be shown on the screen - * (items) into a queue. Then, the next draw_before hook will draw what that + * The after_schedchange hook accumulates the data that need to be shown on the screen + * (items) into a queue. Then, the next before_schedchange hook will draw what that * queue contains. That's the Right Way (TM) of drawing items on the screen, * because we need to draw the background first (and then add icons, text, ... * over it), but we only know the length of a background region once the state - * corresponding to it is over, which happens to be at the next draw_before + * corresponding to it is over, which happens to be at the next before_schedchange * hook. * * We also have a hook called at the end of a chunk to draw the information left @@ -136,8 +136,7 @@ static void process_add(gpointer key, /* Action to do when background computation completed. * - * Eventually, will have to check that every requested traces are finished - * before doing the redraw. It will save unnecessary processor usage. + * Wait for all the awaited computations to be over. */ gint background_ready(void *hook_data, void *call_data) @@ -147,43 +146,28 @@ gint background_ready(void *hook_data, void *call_data) LttvTracesetContext *tsc = lttvwindow_get_traceset_context(control_flow_data->tab); - g_debug("control flow viewer : background computation data ready."); + control_flow_data->background_info_waiting--; + + if(control_flow_data->background_info_waiting == 0) { + g_debug("control flow viewer : background computation data ready."); - drawing_clear(control_flow_data->drawing); - processlist_clear(control_flow_data->process_list); -#if 0 - { - gint num_traces = lttv_traceset_number(tsc->ts); - gint i; - LttvTraceState *ts; - ProcessAddClosure closure; - closure.cfd = control_flow_data; - - for(i=0;itraces[i]; - - closure.trace_num = i; - - /* add all the processes to the list */ - lttv_state_for_each_process(ts, (GHFunc)process_add, &closure); - } + drawing_clear(control_flow_data->drawing); + processlist_clear(control_flow_data->process_list); + redraw_notify(control_flow_data, NULL); } -#endif //0 - redraw_notify(control_flow_data, NULL); return 0; } /* Request background computation. Verify if it is in progress or ready first. - * - * Right now, for all loaded traces. - * - * Later : must be only for each trace in the tab's traceset. + * Only for each trace in the tab's traceset. */ void request_background_data(ControlFlowData *control_flow_data) { - gint num_traces = lttvwindowtraces_get_number(); + LttvTracesetContext * tsc = + lttvwindow_get_traceset_context(control_flow_data->tab); + gint num_traces = lttv_traceset_number(tsc->ts); gint i; LttvTrace *trace; @@ -191,9 +175,10 @@ void request_background_data(ControlFlowData *control_flow_data) lttv_hooks_new(); lttv_hooks_add(background_ready_hook, background_ready, control_flow_data, LTTV_PRIO_DEFAULT); + control_flow_data->background_info_waiting = 0; for(i=0;its, i); if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) { @@ -211,6 +196,7 @@ void request_background_data(ControlFlowData *control_flow_data) ltt_time_infinite, NULL, background_ready_hook); + control_flow_data->background_info_waiting++; } else { /* in progress */ lttvwindowtraces_background_notify_current(control_flow_data, @@ -218,7 +204,7 @@ void request_background_data(ControlFlowData *control_flow_data) ltt_time_infinite, NULL, background_ready_hook); - + control_flow_data->background_info_waiting++; } } } @@ -238,9 +224,9 @@ void request_background_data(ControlFlowData *control_flow_data) * @return The widget created. */ GtkWidget * -h_guicontrolflow(Tab *tab, LttvTracesetSelector * s, char * key) +h_guicontrolflow(Tab *tab) { - g_info("h_guicontrolflow, %p, %p, %s", tab, s, key); + g_info("h_guicontrolflow, %p", tab); ControlFlowData *control_flow_data = guicontrolflow() ; control_flow_data->tab = tab; @@ -279,7 +265,48 @@ int event_selected_hook(void *hook_data, void *call_data) } -/* draw_before_hook + +static __inline PropertiesLine prepare_status_line(LttvProcessState *process) +{ + PropertiesLine prop_line; + prop_line.line_width = 2; + prop_line.style = GDK_LINE_SOLID; + prop_line.y = MIDDLE; + //GdkColormap *colormap = gdk_colormap_get_system(); + + g_debug("prepare_status_line for state : %s", + g_quark_to_string(process->state->s)); + + /* color of line : status of the process */ + if(process->state->s == LTTV_STATE_UNNAMED) + prop_line.color = drawing_colors[COL_WHITE]; + else if(process->state->s == LTTV_STATE_WAIT_FORK) + prop_line.color = drawing_colors[COL_WAIT_FORK]; + else if(process->state->s == LTTV_STATE_WAIT_CPU) + prop_line.color = drawing_colors[COL_WAIT_CPU]; + else if(process->state->s == LTTV_STATE_EXIT) + prop_line.color = drawing_colors[COL_EXIT]; + else if(process->state->s == LTTV_STATE_ZOMBIE) + prop_line.color = drawing_colors[COL_ZOMBIE]; + else if(process->state->s == LTTV_STATE_WAIT) + prop_line.color = drawing_colors[COL_WAIT]; + else if(process->state->s == LTTV_STATE_RUN) + prop_line.color = drawing_colors[COL_RUN]; + else + prop_line.color = drawing_colors[COL_WHITE]; + + //gdk_colormap_alloc_color(colormap, + // prop_line.color, + // FALSE, + // TRUE); + + return prop_line; + +} + + + +/* before_schedchange_hook * * This function basically draw lines and icons. Two types of lines are drawn : * one small (3 pixels?) representing the state of the process and the second @@ -297,10 +324,11 @@ int event_selected_hook(void *hook_data, void *call_data) */ -int draw_before_hook(void *hook_data, void *call_data) +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; @@ -321,32 +349,32 @@ int draw_before_hook(void *hook_data, void *call_data) || ltt_time_compare(evtime, end_time) == 1) return; - guint width = control_flow_data->drawing->width; - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { - - /* 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. - */ + guint width = drawing->width; - guint pid_out; - { - guint pid_in; - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - 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_debug("out : %u in : %u", pid_out, pid_in); - } + /* 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. + */ - /* First, check if the current process is in the state computation process - * list. If it is there, that means we must add it right now and draw items - * from the beginning of the read for it. If it is not present, it's a new - * process and it was not present : it will be added after the state update. - */ + guint pid_out; + guint pid_in; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + 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_debug("out : %u in : %u", pid_out, pid_in); + } + + { + /* For the pid_out */ + /* First, check if the current process is in the state computation + * process list. If it is there, that means we must add it right now and + * draw items from the beginning of the read for it. If it is not + * present, it's a new process and it was not present : it will + * be added after the state update. */ LttvProcessState *process; process = lttv_state_find_process(tfs, pid_out); @@ -355,7 +383,7 @@ int draw_before_hook(void *hook_data, void *call_data) * or add it, and draw its items. */ /* Add process to process list (if not present) */ - guint y_out = 0, height = 0, pl_height = 0; + guint y = 0, height = 0, pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = guicontrolflow_get_process_list(control_flow_data); @@ -364,15 +392,19 @@ int draw_before_hook(void *hook_data, void *call_data) if(processlist_get_process_pixels(process_list, pid_out, + process->last_cpu, &birth, tfc->t_context->index, - &y_out, + &y, &height, &hashed_process_data) == 1) { + g_assert(pid_out == 0 || pid_out != process->ppid); /* Process not present */ processlist_add(process_list, pid_out, + process->last_cpu, + process->ppid, &birth, tfc->t_context->index, name, @@ -380,12 +412,13 @@ int draw_before_hook(void *hook_data, void *call_data) &hashed_process_data); processlist_get_process_pixels(process_list, pid_out, + process->last_cpu, &birth, tfc->t_context->index, - &y_out, + &y, &height, &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y_out, height); + drawing_insert_square( drawing, y, height); } /* Now, the process is in the state hash and our own process hash. @@ -397,15 +430,155 @@ int draw_before_hook(void *hook_data, void *call_data) * because it must be set by before chunk hook to the damage_begin * value. */ - g_assert(hashed_process_data->x != -1); - - + g_assert(hashed_process_data->x.middle != -1); + { + guint x; + DrawContext draw_context; + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &x); + + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; + + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_status_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.middle = x; + } } } - - return 0; + { + /* For the pid_in */ + /* First, check if the current process is in the state computation + * process list. If it is there, that means we must add it right now and + * draw items from the beginning of the read for it. If it is not + * present, it's a new process and it was not present : it will + * be added after the state update. */ + LttvProcessState *process; + process = lttv_state_find_process(tfs, pid_in); + + if(process != NULL) { + /* Well, the process_out existed : we must get it in the process hash + * or add it, and draw its items. + */ + /* Add process to process list (if not present) */ + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + LttTime birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, + pid_in, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid_in == 0 || pid_in != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid_in, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid_in, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data); + drawing_insert_square( drawing, y, height); + } + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ + + /* Check if the x position is unset. In can have been left unset by + * a draw closure from a after chunk hook. This should never happen, + * because it must be set by before chunk hook to the damage_begin + * value. + */ + g_assert(hashed_process_data->x.middle != -1); + { + guint x; + DrawContext draw_context; + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &x); + + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; + + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_status_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + } + + /* become the last x position */ + hashed_process_data->x.middle = x; + } + } + } + return 0; #if 0 @@ -665,7 +838,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_out.foreground->green = 0xffff; prop_text_out.foreground->blue = 0x0000; } - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) { prop_text_out.foreground->red = 0xffff; prop_text_out.foreground->green = 0x0000; @@ -698,7 +871,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_out.text = "WF->"; else if(process_out->state->s == LTTV_STATE_WAIT_CPU) prop_text_out.text = "WC->"; - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) prop_text_out.text = "E->"; else if(process_out->state->s == LTTV_STATE_WAIT) prop_text_out.text = "W->"; @@ -741,7 +914,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_line_out.color->green = 0xffff; prop_line_out.color->blue = 0x0000; } - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) { prop_line_out.color->red = 0xffff; prop_line_out.color->green = 0x0000; @@ -889,7 +1062,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_in.foreground->green = 0xffff; prop_text_in.foreground->blue = 0x0000; } - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) { prop_text_in.foreground->red = 0xffff; prop_text_in.foreground->green = 0x0000; @@ -923,7 +1096,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_text_in.text = "WF->"; else if(process_in->state->s == LTTV_STATE_WAIT_CPU) prop_text_in.text = "WC->"; - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) prop_text_in.text = "E->"; else if(process_in->state->s == LTTV_STATE_WAIT) prop_text_in.text = "W->"; @@ -964,7 +1137,7 @@ int draw_before_hook(void *hook_data, void *call_data) prop_line_in.color->green = 0xffff; prop_line_in.color->blue = 0x0000; } - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) { prop_line_in.color->red = 0xffff; prop_line_in.color->green = 0x0000; @@ -1021,7 +1194,7 @@ int draw_before_hook(void *hook_data, void *call_data) } -/* draw_after_hook +/* after_schedchange_hook * * The draw after hook is called by the reading API to have a * particular event drawn on the screen. @@ -1031,7 +1204,7 @@ int draw_before_hook(void *hook_data, void *call_data) * This function adds items to be drawn in a queue for each process. * */ -int draw_after_hook(void *hook_data, void *call_data) +int after_schedchange_hook(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; @@ -1057,75 +1230,73 @@ int draw_after_hook(void *hook_data, void *call_data) guint width = control_flow_data->drawing->width; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { + /* Add process to process list (if not present) */ + LttvProcessState *process_out, *process_in; + LttTime birth; + guint y_in = 0, y_out = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data_in = NULL; - g_debug("schedchange!"); - - { - /* Add process to process list (if not present) */ - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data_in = NULL; - - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - - guint pid_in; - { - guint pid_out; - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - 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_debug("out : %u in : %u", pid_out, pid_in); - } + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + guint pid_in; + { + guint pid_out; + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + 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_debug("out : %u in : %u", pid_out, pid_in); + } - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - /* It should exist, because we are after the state update. */ - g_assert(process_in != NULL); + /* Find process pid_in in the list... */ + process_in = lttv_state_find_process(tfs, pid_in); + /* It should exist, because we are after the state update. */ + g_assert(process_in != NULL); - birth = process_in->creation_time; - const gchar *name = g_quark_to_string(process_in->name); + birth = process_in->creation_time; + const gchar *name = g_quark_to_string(process_in->name); - if(processlist_get_process_pixels(process_list, - pid_in, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in) == 1) - { - /* Process not present */ - processlist_add(process_list, + if(processlist_get_process_pixels(process_list, + pid_in, + process_in->last_cpu, + &birth, + tfc->t_context->index, + &y_in, + &height, + &hashed_process_data_in) == 1) + { + g_assert(pid_in == 0 || pid_in != process_in->ppid); + /* Process not present */ + processlist_add(process_list, + pid_in, + process_in->last_cpu, + process_in->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data_in); + processlist_get_process_pixels(process_list, pid_in, + process_in->last_cpu, &birth, tfc->t_context->index, - name, - &pl_height, + &y_in, + &height, &hashed_process_data_in); - processlist_get_process_pixels(process_list, - pid_in, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in); - drawing_insert_square( control_flow_data->drawing, y_in, height); - } - - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data_in->x); - } + drawing_insert_square( control_flow_data->drawing, y_in, height); } + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &hashed_process_data_in->x.middle); return 0; @@ -1333,7 +1504,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_out.foreground->green = 0xffff; prop_text_out.foreground->blue = 0x0000; } - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) { prop_text_out.foreground->red = 0xffff; prop_text_out.foreground->green = 0x0000; @@ -1365,7 +1536,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_out.text = "WF"; else if(process_out->state->s == LTTV_STATE_WAIT_CPU) prop_text_out.text = "WC"; - else if(process_out->state->s == LTTV_STATE_EXIT) + else if(process_out->state->s == LTTV_STATE_ZOMBIE) prop_text_out.text = "E"; else if(process_out->state->s == LTTV_STATE_WAIT) prop_text_out.text = "W"; @@ -1474,7 +1645,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_in.foreground->green = 0xffff; prop_text_in.foreground->blue = 0x0000; } - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) { prop_text_in.foreground->red = 0xffff; prop_text_in.foreground->green = 0x0000; @@ -1507,7 +1678,7 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_in.text = "WF"; else if(process_in->state->s == LTTV_STATE_WAIT_CPU) prop_text_in.text = "WC"; - else if(process_in->state->s == LTTV_STATE_EXIT) + else if(process_in->state->s == LTTV_STATE_ZOMBIE) prop_text_in.text = "E"; else if(process_in->state->s == LTTV_STATE_WAIT) prop_text_in.text = "W"; @@ -1583,44 +1754,650 @@ int draw_after_hook(void *hook_data, void *call_data) #endif //0 } +static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) +{ + PropertiesLine prop_line; + prop_line.line_width = 1; + prop_line.style = GDK_LINE_SOLID; + prop_line.y = OVER; + //GdkColormap *colormap = gdk_colormap_get_system(); + + /* color of line : execution mode of the process */ + if(process->state->t == LTTV_STATE_USER_MODE) + prop_line.color = drawing_colors[COL_USER_MODE]; + else if(process->state->t == LTTV_STATE_SYSCALL) + prop_line.color = drawing_colors[COL_SYSCALL]; + else if(process->state->t == LTTV_STATE_TRAP) + prop_line.color = drawing_colors[COL_TRAP]; + else if(process->state->t == LTTV_STATE_IRQ) + prop_line.color = drawing_colors[COL_IRQ]; + else if(process->state->t == LTTV_STATE_MODE_UNKNOWN) + prop_line.color = drawing_colors[COL_MODE_UNKNOWN]; + else + prop_line.color = drawing_colors[COL_WHITE]; + + //gdk_colormap_alloc_color(colormap, + // prop_line.color, + // FALSE, + // TRUE); + + return prop_line; + +} + + +/* before_execmode_hook + * + * This function basically draw lines and icons. Two types of lines are drawn : + * one small (3 pixels?) representing the state of the process and the second + * type is thicker (10 pixels?) representing on which CPU a process is running + * (and this only in running state). + * + * Extremums of the lines : + * x_min : time of the last event context for this process kept in memory. + * x_max : time of the current event. + * y : middle of the process in the process list. The process is found in the + * list, therefore is it's position in pixels. + * + * The choice of lines'color is defined by the context of the last event for this + * process. + */ -gint update_time_window_hook(void *hook_data, void *call_data) +int before_execmode_hook(void *hook_data, void *call_data) { - ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; Drawing_t *drawing = control_flow_data->drawing; - const TimeWindowNotifyData *time_window_nofify_data = - ((const TimeWindowNotifyData *)call_data); + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; - TimeWindow *old_time_window = - 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, - new_time_window); + LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + LttEvent *e; + e = tfc->e; - /* 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) - */ + LttTime evtime = ltt_event_time(e); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); - 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); + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); - g_info("New time window HOOK : %u, %u to %u, %u", - new_time_window->start_time.tv_sec, - new_time_window->start_time.tv_nsec, - new_time_window->time_width.tv_sec, + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + 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 + * time to do it. + */ + /* For the pid */ + LttvProcessState *process = tfs->process; + g_assert(process != NULL); + + guint pid = process->pid; + + /* Well, the process_out existed : we must get it in the process hash + * or add it, and draw its items. + */ + /* Add process to process list (if not present) */ + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + LttTime birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data); + drawing_insert_square( drawing, y, height); + } + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ + + /* Check if the x position is unset. In can have been left unset by + * a draw closure from a after chunk hook. This should never happen, + * because it must be set by before chunk hook to the damage_begin + * value. + */ + g_assert(hashed_process_data->x.over != -1); + { + guint x; + DrawContext draw_context; + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &x); + + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.over; + draw_context.drawinfo.end.x = x; + + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_execmode_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.over = x; + } + + return 0; +} + +/* after_execmode_hook + * + * The draw after hook is called by the reading API to have a + * particular event drawn on the screen. + * @param hook_data ControlFlowData structure of the viewer. + * @param call_data Event context. + * + * This function adds items to be drawn in a queue for each process. + * + */ +int after_execmode_hook(void *hook_data, void *call_data) +{ + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_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 = + lttvwindow_get_time_window(control_flow_data->tab); + + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); + + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + guint width = control_flow_data->drawing->width; + + /* Add process to process list (if not present) */ + LttvProcessState *process; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + + /* Find process pid_in in the list... */ + process = tfs->process; + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); + + guint pid = process->pid; + + birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data); + drawing_insert_square( control_flow_data->drawing, y, height); + } + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &hashed_process_data->x.over); + return 0; +} + + + +/* before_process_hook + * + * Draw lines for process event. + * + * @param hook_data ControlFlowData structure of the viewer. + * @param call_data Event context. + * + * This function adds items to be drawn in a queue for each process. + * + */ +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 *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + + LttEvent *e; + e = tfc->e; + + LttTime evtime = ltt_event_time(e); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); + + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + guint width = control_flow_data->drawing->width; + + guint sub_id; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + sub_id = ltt_event_get_long_unsigned(e,element); + } + + if(sub_id == 3) { /* exit */ + + /* Add process to process list (if not present) */ + LttvProcessState *process = tfs->process; + guint pid = process->pid; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + g_assert(process != NULL); + + birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data); + drawing_insert_square( control_flow_data->drawing, y, height); + } + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ + + /* Check if the x position is unset. In can have been left unset by + * a draw closure from a after chunk hook. This should never happen, + * because it must be set by before chunk hook to the damage_begin + * value. + */ + g_assert(hashed_process_data->x.over != -1); + { + guint x; + DrawContext draw_context; + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &x); + + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + draw_context.drawinfo.end.x = x; + + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; + + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + /* Draw the line */ + PropertiesLine prop_line = prepare_status_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.middle = x; + } + + } + return 0; + +} + + + + + + +/* after_process_hook + * + * Create the processlist entry for the child process. Put the last + * position in x at the current time value. + * + * @param hook_data ControlFlowData structure of the viewer. + * @param call_data Event context. + * + * This function adds items to be drawn in a queue for each process. + * + */ +int after_process_hook(void *hook_data, void *call_data) +{ + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_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 = + lttvwindow_get_time_window(control_flow_data->tab); + + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); + + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + guint width = control_flow_data->drawing->width; + + guint sub_id; + guint param1; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + sub_id = ltt_event_get_long_unsigned(e,element); + element = ltt_field_member(f,1); + param1 = ltt_event_get_long_unsigned(e,element); + } + + if(sub_id == 2) { /* fork */ + + guint child_pid = param1; + /* Add process to process list (if not present) */ + LttvProcessState *process_child; + LttTime birth; + guint y_child = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data_child = NULL; + + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + + /* Find child in the list... */ + process_child = lttv_state_find_process(tfs, child_pid); + /* It should exist, because we are after the state update. */ + g_assert(process_child != NULL); + + birth = process_child->creation_time; + const gchar *name = g_quark_to_string(process_child->name); + + if(processlist_get_process_pixels(process_list, + child_pid, + process_child->last_cpu, + &birth, + tfc->t_context->index, + &y_child, + &height, + &hashed_process_data_child) == 1) + { + g_assert(child_pid == 0 || child_pid != process_child->ppid); + /* Process not present */ + processlist_add(process_list, + child_pid, + process_child->last_cpu, + process_child->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &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); + drawing_insert_square( control_flow_data->drawing, y_child, height); + } + + guint new_x; + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &new_x); + hashed_process_data_child->x.over = new_x; + hashed_process_data_child->x.middle = new_x; + hashed_process_data_child->x.under = new_x; + + } else if(sub_id == 3) { /* exit */ + + /* Add process to process list (if not present) */ + LttvProcessState *process = tfs->process; + guint pid = process->pid; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); + + birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data); + drawing_insert_square( control_flow_data->drawing, y, height); + } + + guint new_x; + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &new_x); + hashed_process_data->x.middle = new_x; + } + return 0; + +} + + +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 = + 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, + new_time_window); + + + /* 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); + + g_info("New time window HOOK : %u, %u to %u, %u", + 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 @@ -1811,12 +2588,15 @@ gint traceset_notify(void *hook_data, void *call_data) Drawing_t *drawing = control_flow_data->drawing; GtkWidget *widget = drawing->drawing_area; - drawing->damage_begin = 0; - drawing->damage_end = drawing->width; drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); + redraw_notify(control_flow_data, NULL); + request_background_data(control_flow_data); +#if 0 + drawing->damage_begin = 0; + drawing->damage_end = drawing->width; if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, @@ -1831,8 +2611,7 @@ gint traceset_notify(void *hook_data, void *call_data) 0,0, drawing->width, drawing->height); - - request_background_data(control_flow_data); +#endif //0 return FALSE; } @@ -1846,6 +2625,9 @@ gint redraw_notify(void *hook_data, void *call_data) drawing->damage_begin = 0; drawing->damage_end = drawing->width; + /* fun feature, to be separated someday... */ + drawing_clear(control_flow_data->drawing); + processlist_clear(control_flow_data->process_list); // Clear the image gdk_draw_rectangle (drawing->pixmap, @@ -1870,7 +2652,6 @@ gint redraw_notify(void *hook_data, void *call_data) 0,0, drawing->width, drawing->height); - return FALSE; } @@ -1910,7 +2691,12 @@ gint update_current_time_hook(void *hook_data, void *call_data) LttTime time_begin = time_window.start_time; LttTime width = time_window.time_width; - LttTime half_width = ltt_time_div(width,2.0); + LttTime half_width; + { + guint64 time_ll = ltt_time_to_uint64(width); + time_ll = time_ll >> 1; /* divide by two */ + half_width = ltt_time_from_uint64(time_ll); + } LttTime time_end = ltt_time_add(time_begin, width); LttvTracesetContext * tsc = @@ -1947,7 +2733,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) new_time_window.start_time = time_begin; new_time_window.time_width = width; - lttvwindow_report_time_window(control_flow_data->tab, &new_time_window); + lttvwindow_report_time_window(control_flow_data->tab, new_time_window); } else if(ltt_time_compare(current_time, time_end) == 1) { @@ -1961,7 +2747,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) new_time_window.start_time = time_begin; new_time_window.time_width = width; - lttvwindow_report_time_window(control_flow_data->tab, &new_time_window); + lttvwindow_report_time_window(control_flow_data->tab, new_time_window); } //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); @@ -1982,227 +2768,134 @@ typedef struct _ClosureData { void draw_closure(gpointer key, gpointer value, gpointer user_data) { - - return; - - -#if 0 ProcessInfo *process_info = (ProcessInfo*)key; HashedProcessData *hashed_process_data = (HashedProcessData*)value; ClosureData *closure_data = (ClosureData*)user_data; - ControlFlowData *control_flow_data = - closure_data->events_request->viewer_data; - - GtkWidget *widget = control_flow_data->drawing->drawing_area; + EventsRequest *events_request = closure_data->events_request; + ControlFlowData *control_flow_data = events_request->viewer_data; + Drawing_t *drawing = control_flow_data->drawing; - /* Get y position of process */ - gint y=0, height=0; - - processlist_get_pixels_from_data( control_flow_data->process_list, - process_info, - hashed_process_data, - &y, - &height); - /* Get last state of process */ - LttvTraceContext *tc = - ((LttvTracesetContext*)closure_data->tss)->traces[process_info->trace_num]; - LttvTracesetContext *tsc = (LttvTracesetContext *)closure_data->tss; + LttvTracesetState *tss = closure_data->tss; + LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss; - LttvTraceState *ts = (LttvTraceState*)tc; - LttvProcessState *process; + LttTime evtime = closure_data->end_time; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); - /* 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; - if(draw_context->previous->middle->x == -1) - { - draw_context->previous->over->x = - control_flow_data->drawing->damage_begin; - draw_context->previous->middle->x = - control_flow_data->drawing->damage_begin; - draw_context->previous->under->x = - control_flow_data->drawing->damage_begin; - - g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_begin); - } + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); - /* Find pixels corresponding to current time . If the time does - * not fit in the window, show a warning, not supposed to happend. */ - guint x = 0; - guint width = control_flow_data->drawing->width; + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); + guint width = drawing->width; - LttTime time = lttv_traceset_context_get_current_tfc(tsc)->timestamp; + { + /* For the process */ + /* First, check if the current process is in the state computation + * process list. If it is there, that means we must add it right now and + * draw items from the beginning of the read for it. If it is not + * present, it's a new process and it was not present : it will + * be added after the state update. */ + g_assert(lttv_traceset_number(tsc->ts) > 0); - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); - - convert_time_to_pixels( - time_window.start_time, - window_end, - time, - width, - &x); - - draw_context->current->middle->x = x; - draw_context->current->over->x = x; - draw_context->current->under->x = x; - draw_context->current->middle->y = y + height/2; - draw_context->current->over->y = y ; - draw_context->current->under->y = y + height; - draw_context->previous->middle->y = y + height/2; - draw_context->previous->over->y = y ; - draw_context->previous->under->y = y + height; - draw_context->drawable = control_flow_data->drawing->pixmap; - draw_context->pango_layout = control_flow_data->drawing->pango_layout; - //draw_context->gc = widget->style->black_gc; - //draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context->gc, widget->style->black_gc); - draw_context->gc = control_flow_data->drawing->gc; - - if(process != NULL && process->state->s == LTTV_STATE_RUN) - { - PropertiesBG prop_bg; - prop_bg.color = g_new(GdkColor,1); - - /*switch(tfc->index) { - case 0: - prop_bg.color->red = 0x1515; - prop_bg.color->green = 0x1515; - prop_bg.color->blue = 0x8c8c; - break; - case 1: - prop_bg.color->red = 0x4e4e; - prop_bg.color->green = 0xa9a9; - prop_bg.color->blue = 0xa4a4; - break; - case 2: - prop_bg.color->red = 0x7a7a; - prop_bg.color->green = 0x4a4a; - prop_bg.color->blue = 0x8b8b; - break; - case 3: - prop_bg.color->red = 0x8080; - prop_bg.color->green = 0x7777; - prop_bg.color->blue = 0x4747; - break; - default: - prop_bg.color->red = 0xe7e7; - prop_bg.color->green = 0xe7e7; - prop_bg.color->blue = 0xe7e7; - } - */ + /* tracefiles[0] is ok here, because we draw for every PID, and + * assume CPU 0 for PID 0 //FIXME */ + LttvTracefileState *tfs = + (LttvTracefileState*)tsc->traces[process_info->trace_num]->tracefiles[0]; - 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); - } + LttvProcessState *process; + process = lttv_state_find_process(tfs, + process_info->pid); + if(process != NULL) { + + /* Only draw for processes that are currently in the trace states */ - PropertiesLine prop_line; - prop_line.color = g_new(GdkColor,1); - prop_line.line_width = 2; - prop_line.style = GDK_LINE_SOLID; - prop_line.position = MIDDLE; + guint y = 0, height = 0, pl_height = 0; + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + LttTime birth = process_info->birth; + + /* Should be alike when background info is ready */ + if(control_flow_data->background_info_waiting==0) + g_assert(ltt_time_compare(process->creation_time, + process_info->birth) == 0); + const gchar *name = g_quark_to_string(process->name); + + /* process HAS to be present */ + g_assert(processlist_get_process_pixels(process_list, + process_info->pid, + process_info->cpu, + &birth, + process_info->trace_num, + &y, + &height, + &hashed_process_data) != 1); + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ + + /* Check if the x position is unset. In can have been left unset by + * a draw closure from a after chunk hook. This should never happen, + * because it must be set by before chunk hook to the damage_begin + * value. + */ + g_assert(hashed_process_data->x.over != -1); + { + guint x; + DrawContext draw_context; - /* color of line : status of the process */ - if(process != NULL) - { - 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; - } + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &x); - } - else - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xffff; - } + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = drawing->pixmap; + draw_context.gc = drawing->gc; + draw_context.pango_layout = drawing->pango_layout; + draw_context.drawinfo.end.x = x; - draw_line((void*)&prop_line, (void*)draw_context); - g_free(prop_line.color); - //gdk_gc_unref(draw_context->gc); - - /* Reset draw_context of the process for next request */ - - hashed_process_data->draw_context->drawable = NULL; - hashed_process_data->draw_context->gc = NULL; - hashed_process_data->draw_context->pango_layout = NULL; - hashed_process_data->draw_context->current->over->x = -1; - hashed_process_data->draw_context->current->over->y = -1; - hashed_process_data->draw_context->current->middle->x = -1; - hashed_process_data->draw_context->current->middle->y = -1; - hashed_process_data->draw_context->current->under->x = -1; - hashed_process_data->draw_context->current->under->y = -1; - hashed_process_data->draw_context->current->modify_over->x = -1; - hashed_process_data->draw_context->current->modify_over->y = -1; - hashed_process_data->draw_context->current->modify_middle->x = -1; - hashed_process_data->draw_context->current->modify_middle->y = -1; - hashed_process_data->draw_context->current->modify_under->x = -1; - hashed_process_data->draw_context->current->modify_under->y = -1; - hashed_process_data->draw_context->current->status = LTTV_STATE_UNNAMED; - hashed_process_data->draw_context->previous->over->x = -1; - hashed_process_data->draw_context->previous->over->y = -1; - hashed_process_data->draw_context->previous->middle->x = -1; - hashed_process_data->draw_context->previous->middle->y = -1; - hashed_process_data->draw_context->previous->under->x = -1; - hashed_process_data->draw_context->previous->under->y = -1; - hashed_process_data->draw_context->previous->modify_over->x = -1; - hashed_process_data->draw_context->previous->modify_over->y = -1; - hashed_process_data->draw_context->previous->modify_middle->x = -1; - hashed_process_data->draw_context->previous->modify_middle->y = -1; - hashed_process_data->draw_context->previous->modify_under->x = -1; - hashed_process_data->draw_context->previous->modify_under->y = -1; - hashed_process_data->draw_context->previous->status = LTTV_STATE_UNNAMED; + draw_context.drawinfo.y.over = y+1; + draw_context.drawinfo.y.middle = y+(height/2); + draw_context.drawinfo.y.under = y+height; -#endif //0 + draw_context.drawinfo.start.offset.over = 0; + draw_context.drawinfo.start.offset.middle = 0; + draw_context.drawinfo.start.offset.under = 0; + draw_context.drawinfo.end.offset.over = 0; + draw_context.drawinfo.end.offset.middle = 0; + draw_context.drawinfo.end.offset.under = 0; + + { + draw_context.drawinfo.start.x = hashed_process_data->x.over; + /* Draw the line */ + PropertiesLine prop_line = prepare_execmode_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + hashed_process_data->x.over = x; + { + draw_context.drawinfo.start.x = hashed_process_data->x.middle; + /* Draw the line */ + PropertiesLine prop_line = prepare_status_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + + /* become the last x position */ + hashed_process_data->x.middle = x; + } + } + } + return; } int before_chunk(void *hook_data, void *call_data) @@ -2263,7 +2956,7 @@ int after_request(void *hook_data, void *call_data) /* * for each process * draw closing line - * expose + * expose */ int after_chunk(void *hook_data, void *call_data) { @@ -2278,10 +2971,10 @@ int after_chunk(void *hook_data, void *call_data) guicontrolflow_get_process_list(control_flow_data); if(tfc != NULL) - end_time = tfc->timestamp; - else /* end of traceset */ - end_time = tsc->time_span.end_time; - + end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time); + else /* end of traceset, or position now out of request : end */ + end_time = events_request->end_time; + ClosureData closure_data; closure_data.events_request = (EventsRequest*)hook_data; closure_data.tss = tss;