X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=ab2cf623ae52ca54c33ebc99a43aa1294c6f3780;hb=ebf4f7355aa8bd24a81554b49c22b7d9f44503b0;hp=efc2dea947ec3f51cfc71e751d7ffc2bffb27997;hpb=cef97e7c926bfe509b0b58d9c38bab60d30c81f8;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 efc2dea9..ab2cf623 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -152,11 +152,22 @@ int draw_event_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); + + LttTime end_time = ltt_time_add(time_window->start_time, + time_window->time_width); + //if(time < time_beg || time > time_end) return; + if(ltt_time_compare(evtime, time_window->start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { g_critical("schedchange!"); @@ -182,9 +193,11 @@ int draw_event_hook(void *hook_data, void *call_data) /* 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)); - + birth = process_out->creation_time; gchar *name = strdup(g_quark_to_string(process_out->name)); HashedProcessData *hashed_process_data_out = NULL; @@ -192,6 +205,7 @@ int draw_event_hook(void *hook_data, void *call_data) if(processlist_get_process_pixels(process_list, pid_out, &birth, + tfc->t_context->index, &y_out, &height, &hashed_process_data_out) == 1) @@ -200,12 +214,14 @@ int draw_event_hook(void *hook_data, void *call_data) processlist_add(process_list, pid_out, &birth, + tfc->t_context->index, name, &pl_height, &hashed_process_data_out); processlist_get_process_pixels(process_list, pid_out, &birth, + tfc->t_context->index, &y_out, &height, &hashed_process_data_out); @@ -215,7 +231,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)); birth = process_in->creation_time; @@ -225,6 +243,7 @@ int draw_event_hook(void *hook_data, void *call_data) if(processlist_get_process_pixels(process_list, pid_in, &birth, + tfc->t_context->index, &y_in, &height, &hashed_process_data_in) == 1) @@ -233,12 +252,14 @@ int draw_event_hook(void *hook_data, void *call_data) processlist_add(process_list, pid_in, &birth, + tfc->t_context->index, name, &pl_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); @@ -265,8 +286,7 @@ int draw_event_hook(void *hook_data, void *call_data) time, width, &x); - - assert(x <= width); + //assert(x <= width); /* draw what represents the event for outgoing process. */ @@ -279,13 +299,79 @@ int draw_event_hook(void *hook_data, void *call_data) draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; GtkWidget *widget = control_flow_data->drawing->drawing_area; //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); + //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); //draw_context_out->gc = widget->style->black_gc; //draw_arc((void*)&prop_arc, (void*)draw_context_out); //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); + /* Draw the line/background of the out process */ + if(draw_context_out->previous->middle->x == -1) + { + draw_context_out->previous->over->x = event_request->x_begin; + 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); + } + + draw_context_out->current->middle->x = x; + draw_context_out->current->over->x = x; + draw_context_out->current->under->x = x; + draw_context_out->current->middle->y = y_out + height/2; + draw_context_out->current->over->y = y_out; + draw_context_out->current->under->y = y_out + height; + draw_context_out->previous->middle->y = y_out + height/2; + draw_context_out->previous->over->y = y_out; + draw_context_out->previous->under->y = y_out + height; + + draw_context_out->drawable = control_flow_data->drawing->pixmap; + draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; + + if(process_out->state->s == LTTV_STATE_RUN) + { + draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); + + 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; + } + + g_critical("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); + } + + draw_context_out->gc = widget->style->black_gc; + GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; GdkColor colorbg_out = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_out; @@ -304,8 +390,8 @@ int draw_event_hook(void *hook_data, void *call_data) else if(process_out->state->s == LTTV_STATE_WAIT_FORK) { prop_text_out.foreground->red = 0x0fff; - prop_text_out.foreground->green = 0x0000; - prop_text_out.foreground->blue = 0x0fff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0xfff0; } else if(process_out->state->s == LTTV_STATE_WAIT_CPU) { @@ -338,6 +424,7 @@ int draw_event_hook(void *hook_data, void *call_data) prop_text_out.foreground->blue = 0xffff; } + /* Print status of the process : U, WF, WC, E, W, R */ if(process_out->state->s == LTTV_STATE_UNNAMED) prop_text_out.text = "U->"; @@ -355,21 +442,8 @@ int draw_event_hook(void *hook_data, void *call_data) prop_text_out.text = "U"; draw_text((void*)&prop_text_out, (void*)draw_context_out); - gdk_gc_unref(draw_context_out->gc); + //gdk_gc_unref(draw_context_out->gc); - /* Draw the line of the out process */ - if(draw_context_out->previous->middle->x == -1) - { - draw_context_out->previous->middle->x = event_request->x_begin; - g_critical("out middle x_beg : %u",event_request->x_begin); - } - - draw_context_out->current->middle->x = x; - draw_context_out->current->middle->y = y_out + height/2; - draw_context_out->previous->middle->y = y_out + height/2; - draw_context_out->drawable = control_flow_data->drawing->pixmap; - draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; - //draw_context_out->gc = widget->style->black_gc; draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); @@ -378,6 +452,8 @@ int draw_event_hook(void *hook_data, void *call_data) prop_line_out.line_width = 2; 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)); /* color of line : status of the process */ if(process_out->state->s == LTTV_STATE_UNNAMED) @@ -389,8 +465,8 @@ int draw_event_hook(void *hook_data, void *call_data) else if(process_out->state->s == LTTV_STATE_WAIT_FORK) { prop_line_out.color->red = 0x0fff; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0x0fff; + prop_line_out.color->green = 0xffff; + prop_line_out.color->blue = 0xfff0; } else if(process_out->state->s == LTTV_STATE_WAIT_CPU) { @@ -440,12 +516,78 @@ int draw_event_hook(void *hook_data, void *call_data) widget = control_flow_data->drawing->drawing_area; //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; //draw_context_in->gc = widget->style->black_gc; - draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); + //draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + //gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); //draw_arc((void*)&prop_arc, (void*)draw_context_in); //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); + + /* Draw the line/bg of the in process */ + if(draw_context_in->previous->middle->x == -1) + { + 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); + } + + draw_context_in->current->middle->x = x; + draw_context_in->current->over->x = x; + draw_context_in->current->under->x = x; + draw_context_in->current->middle->y = y_in + height/2; + draw_context_in->current->over->y = y_in; + draw_context_in->current->under->y = y_in + height; + draw_context_in->previous->middle->y = y_in + height/2; + draw_context_in->previous->over->y = y_in; + draw_context_in->previous->under->y = y_in + height; + draw_context_in->drawable = control_flow_data->drawing->pixmap; + draw_context_in->pango_layout = control_flow_data->drawing->pango_layout; + + + if(process_in->state->s == LTTV_STATE_RUN) + { + draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); + + 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; + } + + + draw_bg((void*)&prop_bg, (void*)draw_context_in); + g_free(prop_bg.color); + gdk_gc_unref(draw_context_in->gc); + } + + draw_context_in->gc = widget->style->black_gc; + GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; GdkColor colorbg_in = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_in; @@ -454,6 +596,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)); /* foreground of text : status of the process */ if(process_in->state->s == LTTV_STATE_UNNAMED) { @@ -464,8 +607,8 @@ int draw_event_hook(void *hook_data, void *call_data) else if(process_in->state->s == LTTV_STATE_WAIT_FORK) { prop_text_in.foreground->red = 0x0fff; - prop_text_in.foreground->green = 0x0000; - prop_text_in.foreground->blue = 0x0fff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xfff0; } else if(process_in->state->s == LTTV_STATE_WAIT_CPU) { @@ -517,24 +660,11 @@ int draw_event_hook(void *hook_data, void *call_data) prop_text_in.text = "U"; draw_text((void*)&prop_text_in, (void*)draw_context_in); - gdk_gc_unref(draw_context_in->gc); - - /* Draw the line of the in process */ - if(draw_context_in->previous->middle->x == -1) - { - draw_context_in->previous->middle->x = event_request->x_begin; - g_critical("in middle x_beg : %u",event_request->x_begin); - } - - draw_context_in->current->middle->x = x; - draw_context_in->previous->middle->y = y_in + height/2; - draw_context_in->current->middle->y = y_in + height/2; - draw_context_in->drawable = control_flow_data->drawing->pixmap; - draw_context_in->pango_layout = control_flow_data->drawing->pango_layout; - //draw_context_in->gc = widget->style->black_gc; + //gdk_gc_unref(draw_context_in->gc); + draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); - + PropertiesLine prop_line_in; prop_line_in.color = g_new(GdkColor,1); prop_line_in.line_width = 2; @@ -551,8 +681,8 @@ int draw_event_hook(void *hook_data, void *call_data) else if(process_in->state->s == LTTV_STATE_WAIT_FORK) { prop_line_in.color->red = 0x0fff; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0x0fff; + prop_line_in.color->green = 0xffff; + prop_line_in.color->blue = 0xfff0; } else if(process_in->state->s == LTTV_STATE_WAIT_CPU) { @@ -623,11 +753,24 @@ 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); + + LttTime end_time = ltt_time_add(time_window->start_time, + time_window->time_width); + //if(time < time_beg || time > time_end) return; + if(ltt_time_compare(evtime, time_window->start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { g_critical("schedchange!"); @@ -653,7 +796,8 @@ int draw_after_hook(void *hook_data, void *call_data) /* Find process pid_out in the list... */ - process_out = lttv_state_find_process(tfs, pid_out); + process_out = lttv_state_find_process_from_trace(ts, pid_out); + if(process_out == NULL) return 0; //g_critical("out : %s",g_quark_to_string(process_out->state->s)); birth = process_out->creation_time; @@ -663,6 +807,7 @@ int draw_after_hook(void *hook_data, void *call_data) if(processlist_get_process_pixels(process_list, pid_out, &birth, + tfc->t_context->index, &y_out, &height, &hashed_process_data_out) == 1) @@ -671,12 +816,14 @@ int draw_after_hook(void *hook_data, void *call_data) processlist_add(process_list, pid_out, &birth, + tfc->t_context->index, name, &pl_height, &hashed_process_data_out); processlist_get_process_pixels(process_list, pid_out, &birth, + tfc->t_context->index, &y_out, &height, &hashed_process_data_out); @@ -686,7 +833,8 @@ 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(tfs, pid_in); + process_in = lttv_state_find_process_from_trace(ts, pid_in); + if(process_in == NULL) return 0; //g_critical("in : %s",g_quark_to_string(process_in->state->s)); birth = process_in->creation_time; @@ -696,6 +844,7 @@ int draw_after_hook(void *hook_data, void *call_data) if(processlist_get_process_pixels(process_list, pid_in, &birth, + tfc->t_context->index, &y_in, &height, &hashed_process_data_in) == 1) @@ -704,12 +853,14 @@ int draw_after_hook(void *hook_data, void *call_data) processlist_add(process_list, pid_in, &birth, + tfc->t_context->index, name, &pl_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); @@ -749,11 +900,28 @@ int draw_after_hook(void *hook_data, void *call_data) draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; GtkWidget *widget = control_flow_data->drawing->drawing_area; //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - draw_context_out->gc = widget->style->black_gc; - + //draw_arc((void*)&prop_arc, (void*)draw_context_out); //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); - + + /*if(process_out->state->s == LTTV_STATE_RUN) + { + draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); + PropertiesBG prop_bg; + prop_bg.color = g_new(GdkColor,1); + + prop_bg.color->red = 0xffff; + prop_bg.color->green = 0xffff; + prop_bg.color->blue = 0xffff; + + draw_bg((void*)&prop_bg, (void*)draw_context_out); + g_free(prop_bg.color); + gdk_gc_unref(draw_context_out->gc); + }*/ + + draw_context_out->gc = widget->style->black_gc; + GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; GdkColor colorbg_out = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_out; @@ -772,8 +940,8 @@ int draw_after_hook(void *hook_data, void *call_data) else if(process_out->state->s == LTTV_STATE_WAIT_FORK) { prop_text_out.foreground->red = 0x0fff; - prop_text_out.foreground->green = 0x0000; - prop_text_out.foreground->blue = 0x0fff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0xfff0; } else if(process_out->state->s == LTTV_STATE_WAIT_CPU) { @@ -823,8 +991,12 @@ int draw_after_hook(void *hook_data, void *call_data) prop_text_out.text = "U"; draw_text((void*)&prop_text_out, (void*)draw_context_out); + + //gdk_gc_unref(draw_context_out->gc); draw_context_out->current->middle->y = y_out+height/2; + draw_context_out->current->over->y = y_out; + draw_context_out->current->under->y = y_out+height; draw_context_out->current->status = process_out->state->s; /* for pid_out : remove previous, Prev = current, new current (default) */ @@ -869,11 +1041,28 @@ int draw_after_hook(void *hook_data, void *call_data) draw_context_in->pango_layout = control_flow_data->drawing->pango_layout; widget = control_flow_data->drawing->drawing_area; //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - draw_context_in->gc = widget->style->black_gc; //draw_arc((void*)&prop_arc, (void*)draw_context_in); //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); - + + /*if(process_in->state->s == LTTV_STATE_RUN) + { + draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); + PropertiesBG prop_bg; + prop_bg.color = g_new(GdkColor,1); + + prop_bg.color->red = 0xffff; + prop_bg.color->green = 0xffff; + prop_bg.color->blue = 0xffff; + + draw_bg((void*)&prop_bg, (void*)draw_context_in); + g_free(prop_bg.color); + gdk_gc_unref(draw_context_in->gc); + }*/ + + draw_context_in->gc = widget->style->black_gc; + GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; GdkColor colorbg_in = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_in; @@ -892,8 +1081,8 @@ int draw_after_hook(void *hook_data, void *call_data) else if(process_in->state->s == LTTV_STATE_WAIT_FORK) { prop_text_in.foreground->red = 0x0fff; - prop_text_in.foreground->green = 0x0000; - prop_text_in.foreground->blue = 0x0fff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xfff0; } else if(process_in->state->s == LTTV_STATE_WAIT_CPU) { @@ -945,6 +1134,7 @@ int draw_after_hook(void *hook_data, void *call_data) draw_text((void*)&prop_text_in, (void*)draw_context_in); + if(process_in->state->s == LTTV_STATE_RUN) { gchar tmp[255]; @@ -967,6 +1157,8 @@ int draw_after_hook(void *hook_data, void *call_data) draw_context_in->current->middle->y = y_in+height/2; + draw_context_in->current->over->y = y_in; + draw_context_in->current->under->y = y_in+height; draw_context_in->current->status = process_in->state->s; /* for pid_in : remove previous, Prev = current, new current (default) */ @@ -1016,6 +1208,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) guicontrolflow_get_time_window(control_flow_data); TimeWindow *new_time_window = ((TimeWindow*)call_data); + /* 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 @@ -1197,6 +1394,8 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->height); } + + return 0; } @@ -1269,7 +1468,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) typedef struct _ClosureData { EventRequest *event_request; - LttvTraceState *ts; + LttvTracesetState *tss; } ClosureData; @@ -1294,29 +1493,78 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) &height); /* Get last state of process */ LttvTraceContext *tc = - (LttvTraceContext *)closure_data->ts; + ((LttvTracesetContext*)closure_data->tss)->traces[process_info->trace_num]; + //LttvTracefileContext *tfc = (LttvTracefileContext *)closure_data->ts; - LttvTraceState *ts = closure_data->ts; + LttvTraceState *ts = (LttvTraceState*)tc; LttvProcessState *process; - process = lttv_state_find_process((LttvTracefileState*)ts, process_info->pid); + process = lttv_state_find_process_from_trace(ts, 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->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); } draw_context->current->middle->x = closure_data->event_request->x_end; + draw_context->current->over->x = closure_data->event_request->x_end; + draw_context->current->under->x = closure_data->event_request->x_end; 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); + + 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; + } + */ + + g_critical("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); + } + PropertiesLine prop_line; prop_line.color = g_new(GdkColor,1); @@ -1325,47 +1573,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) - { - prop_line.color->red = 0x0fff; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0x0fff; - } - 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) + if(process != NULL) { - 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); @@ -1422,7 +1680,7 @@ int after_data_request(void *hook_data, void *call_data) ClosureData closure_data; closure_data.event_request = (EventRequest*)hook_data; - closure_data.ts = (LttvTraceState*)call_data; + closure_data.tss = (LttvTracesetState*)call_data; g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data);