X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=8b9909611a2922d9fa99a4108c52d9d20728b50c;hb=2a2fa4f0852b2a2701733c370059bad8aa000b03;hp=a1ae64b48a69378cd2f656dfe66eeeaa4efe19bc;hpb=a117e3f7f0b05f343f65e0690722fa760b77d215;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 a1ae64b4..8b990961 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -1,17 +1,34 @@ +/* This file is part of the Linux Trace Toolkit viewer + * Copyright (C) 2003-2004 Mathieu Desnoyers + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License Version 2 as + * published by the Free Software Foundation; + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, + * MA 02111-1307, USA. + */ + + /***************************************************************************** * Hooks to be called by the main window * *****************************************************************************/ -#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 #include #include #include +#include //#include @@ -19,10 +36,11 @@ #include #include +#include #include #include #include -#include +#include #include "eventhooks.h" @@ -60,14 +78,14 @@ h_guicontrolflow(MainWindow *mw, LttvTracesetSelector * s, char * key) current_time->tv_sec = 0; current_time->tv_nsec = 0; - //g_critical("time width1 : %u",time_window->time_width); + //g_debug("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); @@ -82,7 +100,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 ; @@ -132,14 +150,25 @@ 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!"); + g_debug("schedchange!"); /* Add process to process list (if not present) and get drawing "y" from * process position */ @@ -158,13 +187,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; @@ -172,6 +202,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) @@ -180,12 +211,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); @@ -196,7 +229,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)); @@ -205,6 +239,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) @@ -213,12 +248,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); @@ -245,91 +282,192 @@ 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. */ DrawContext *draw_context_out = hashed_process_data_out->draw_context; draw_context_out->current->modify_over->x = x; + draw_context_out->current->modify_under->x = x; draw_context_out->current->modify_over->y = y_out; + draw_context_out->current->modify_under->y = y_out+(height/2)+2; draw_context_out->drawable = control_flow_data->drawing->pixmap; 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_debug("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_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); + } + + draw_context_out->gc = widget->style->black_gc; + GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; - GdkColor colorbg_out = { 0, 0xffff, 0xffff, 0xffff }; + GdkColor colorbg_out = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_out; prop_text_out.foreground = &colorfg_out; prop_text_out.background = &colorbg_out; - prop_text_out.size = 10; + prop_text_out.size = 6; prop_text_out.position = OVER; + /* color of text : status of the process */ + if(process_out->state->s == LTTV_STATE_UNNAMED) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0xffff; + } + else if(process_out->state->s == LTTV_STATE_WAIT_FORK) + { + prop_text_out.foreground->red = 0x0fff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0xfff0; + } + else if(process_out->state->s == LTTV_STATE_WAIT_CPU) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0x0000; + } + else if(process_out->state->s == LTTV_STATE_EXIT) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0x0000; + prop_text_out.foreground->blue = 0xffff; + } + else if(process_out->state->s == LTTV_STATE_WAIT) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0x0000; + prop_text_out.foreground->blue = 0x0000; + } + else if(process_out->state->s == LTTV_STATE_RUN) + { + prop_text_out.foreground->red = 0x0000; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0x0000; + } + else + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0xffff; + 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"; + prop_text_out.text = "U->"; else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - prop_text_out.text = "WF"; + prop_text_out.text = "WF->"; else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - prop_text_out.text = "WC"; + prop_text_out.text = "WC->"; else if(process_out->state->s == LTTV_STATE_EXIT) - prop_text_out.text = "E"; + prop_text_out.text = "E->"; else if(process_out->state->s == LTTV_STATE_WAIT) - prop_text_out.text = "W"; + prop_text_out.text = "W->"; else if(process_out->state->s == LTTV_STATE_RUN) - prop_text_out.text = "R"; + prop_text_out.text = "R->"; else 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); PropertiesLine prop_line_out; prop_line_out.color = g_new(GdkColor,1); - prop_line_out.line_width = 4; + prop_line_out.line_width = 2; prop_line_out.style = GDK_LINE_SOLID; prop_line_out.position = MIDDLE; + + 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) { - prop_line_out.color->red = 0x0000; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0x0000; + prop_line_out.color->red = 0xffff; + prop_line_out.color->green = 0xffff; + prop_line_out.color->blue = 0xffff; } 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) { - prop_line_out.color->red = 0x0fff; - prop_line_out.color->green = 0x0fff; + prop_line_out.color->red = 0xffff; + prop_line_out.color->green = 0xffff; prop_line_out.color->blue = 0x0000; } else if(process_out->state->s == LTTV_STATE_EXIT) @@ -352,9 +490,9 @@ int draw_event_hook(void *hook_data, void *call_data) } else { - prop_line_out.color->red = 0x0000; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0x0000; + prop_line_out.color->red = 0xffff; + prop_line_out.color->green = 0xffff; + prop_line_out.color->blue = 0xffff; } draw_line((void*)&prop_line_out, (void*)draw_context_out); @@ -366,84 +504,186 @@ int draw_event_hook(void *hook_data, void *call_data) DrawContext *draw_context_in = hashed_process_data_in->draw_context; draw_context_in->current->modify_over->x = x; + draw_context_in->current->modify_under->x = x; draw_context_in->current->modify_over->y = y_in; + draw_context_in->current->modify_under->y = y_in+(height/2)+2; draw_context_in->drawable = control_flow_data->drawing->pixmap; 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_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_debug("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, 0xffff, 0xffff, 0xffff }; + GdkColor colorbg_in = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_in; prop_text_in.foreground = &colorfg_in; prop_text_in.background = &colorbg_in; - prop_text_in.size = 10; + prop_text_in.size = 6; prop_text_in.position = OVER; + 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) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xffff; + } + else if(process_in->state->s == LTTV_STATE_WAIT_FORK) + { + prop_text_in.foreground->red = 0x0fff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xfff0; + } + else if(process_in->state->s == LTTV_STATE_WAIT_CPU) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0x0000; + } + else if(process_in->state->s == LTTV_STATE_EXIT) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0x0000; + prop_text_in.foreground->blue = 0xffff; + } + else if(process_in->state->s == LTTV_STATE_WAIT) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0x0000; + prop_text_in.foreground->blue = 0x0000; + } + else if(process_in->state->s == LTTV_STATE_RUN) + { + prop_text_in.foreground->red = 0x0000; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0x0000; + } + else + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xffff; + } + + + /* Print status of the process : U, WF, WC, E, W, R */ if(process_in->state->s == LTTV_STATE_UNNAMED) - prop_text_in.text = "U"; + prop_text_in.text = "U->"; else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - prop_text_in.text = "WF"; + prop_text_in.text = "WF->"; else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - prop_text_in.text = "WC"; + prop_text_in.text = "WC->"; else if(process_in->state->s == LTTV_STATE_EXIT) - prop_text_in.text = "E"; + prop_text_in.text = "E->"; else if(process_in->state->s == LTTV_STATE_WAIT) - prop_text_in.text = "W"; + prop_text_in.text = "W->"; else if(process_in->state->s == LTTV_STATE_RUN) - prop_text_in.text = "R"; + prop_text_in.text = "R->"; else 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 = 4; + prop_line_in.line_width = 2; prop_line_in.style = GDK_LINE_SOLID; prop_line_in.position = MIDDLE; /* color of line : status of the process */ if(process_in->state->s == LTTV_STATE_UNNAMED) { - prop_line_in.color->red = 0x0000; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0x0000; + prop_line_in.color->red = 0xffff; + prop_line_in.color->green = 0xffff; + prop_line_in.color->blue = 0xffff; } 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) { - prop_line_in.color->red = 0x0fff; - prop_line_in.color->green = 0x0fff; + prop_line_in.color->red = 0xffff; + prop_line_in.color->green = 0xffff; prop_line_in.color->blue = 0x0000; } else if(process_in->state->s == LTTV_STATE_EXIT) @@ -466,9 +706,9 @@ int draw_event_hook(void *hook_data, void *call_data) } else { - prop_line_in.color->red = 0x0000; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0x0000; + prop_line_in.color->red = 0xffff; + prop_line_in.color->green = 0xffff; + prop_line_in.color->blue = 0xffff; } draw_line((void*)&prop_line_in, (void*)draw_context_in); @@ -509,14 +749,27 @@ 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!"); + g_debug("schedchange!"); /* Add process to process list (if not present) and get drawing "y" from * process position */ @@ -535,12 +788,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)); @@ -549,6 +803,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) @@ -557,12 +812,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); @@ -573,7 +830,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)); @@ -582,6 +840,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) @@ -590,12 +849,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); @@ -630,23 +891,85 @@ int draw_after_hook(void *hook_data, void *call_data) DrawContext *draw_context_out = hashed_process_data_out->draw_context; //draw_context_out->current->modify_over->x = x; draw_context_out->current->modify_over->y = y_out; + draw_context_out->current->modify_under->y = y_out+(height/2)+2; draw_context_out->drawable = control_flow_data->drawing->pixmap; 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, 0xffff, 0xffff, 0xffff }; + GdkColor colorbg_out = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_out; prop_text_out.foreground = &colorfg_out; prop_text_out.background = &colorbg_out; - prop_text_out.size = 10; + prop_text_out.size = 6; prop_text_out.position = OVER; + /* color of text : status of the process */ + if(process_out->state->s == LTTV_STATE_UNNAMED) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0xffff; + } + else if(process_out->state->s == LTTV_STATE_WAIT_FORK) + { + prop_text_out.foreground->red = 0x0fff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0xfff0; + } + else if(process_out->state->s == LTTV_STATE_WAIT_CPU) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0x0000; + } + else if(process_out->state->s == LTTV_STATE_EXIT) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0x0000; + prop_text_out.foreground->blue = 0xffff; + } + else if(process_out->state->s == LTTV_STATE_WAIT) + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0x0000; + prop_text_out.foreground->blue = 0x0000; + } + else if(process_out->state->s == LTTV_STATE_RUN) + { + prop_text_out.foreground->red = 0x0000; + prop_text_out.foreground->green = 0xffff; + prop_text_out.foreground->blue = 0x0000; + } + else + { + prop_text_out.foreground->red = 0xffff; + prop_text_out.foreground->green = 0xffff; + 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"; @@ -665,7 +988,11 @@ int draw_after_hook(void *hook_data, void *call_data) 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) */ @@ -705,23 +1032,86 @@ int draw_after_hook(void *hook_data, void *call_data) DrawContext *draw_context_in = hashed_process_data_in->draw_context; //draw_context_in->current->modify_over->x = x; draw_context_in->current->modify_over->y = y_in; + draw_context_in->current->modify_under->y = y_in+(height/2)+2; draw_context_in->drawable = control_flow_data->drawing->pixmap; 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, 0xffff, 0xffff, 0xffff }; + GdkColor colorbg_in = { 0, 0x0000, 0x0000, 0x0000 }; PropertiesText prop_text_in; prop_text_in.foreground = &colorfg_in; prop_text_in.background = &colorbg_in; - prop_text_in.size = 10; + prop_text_in.size = 6; prop_text_in.position = OVER; + /* foreground of text : status of the process */ + if(process_in->state->s == LTTV_STATE_UNNAMED) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xffff; + } + else if(process_in->state->s == LTTV_STATE_WAIT_FORK) + { + prop_text_in.foreground->red = 0x0fff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xfff0; + } + else if(process_in->state->s == LTTV_STATE_WAIT_CPU) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0x0000; + } + else if(process_in->state->s == LTTV_STATE_EXIT) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0x0000; + prop_text_in.foreground->blue = 0xffff; + } + else if(process_in->state->s == LTTV_STATE_WAIT) + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0x0000; + prop_text_in.foreground->blue = 0x0000; + } + else if(process_in->state->s == LTTV_STATE_RUN) + { + prop_text_in.foreground->red = 0x0000; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0x0000; + } + else + { + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xffff; + } + + /* Print status of the process : U, WF, WC, E, W, R */ if(process_in->state->s == LTTV_STATE_UNNAMED) prop_text_in.text = "U"; @@ -740,7 +1130,31 @@ 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]; + prop_text_in.foreground = &colorfg_in; + prop_text_in.background = &colorbg_in; + prop_text_in.foreground->red = 0xffff; + prop_text_in.foreground->green = 0xffff; + prop_text_in.foreground->blue = 0xffff; + prop_text_in.size = 6; + prop_text_in.position = UNDER; + + prop_text_in.text = g_new(gchar, 260); + strcpy(prop_text_in.text, "CPU "); + snprintf(tmp, 255, "%u", tfc->index); + strcat(prop_text_in.text, tmp); + + draw_text((void*)&prop_text_in, (void*)draw_context_in); + g_free(prop_text_in.text); + } + + 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) */ @@ -790,6 +1204,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 @@ -839,7 +1258,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Copy old data to new location */ gdk_draw_drawable (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->drawing_area->style->black_gc, control_flow_data->drawing->pixmap, x, 0, 0, 0, @@ -855,7 +1274,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) *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->white_gc, + control_flow_data->drawing->drawing_area->style->black_gc, TRUE, x+SAFETY, 0, control_flow_data->drawing->width - x, // do not overlap @@ -893,7 +1312,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Copy old data to new location */ gdk_draw_drawable (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->drawing_area->style->black_gc, control_flow_data->drawing->pixmap, 0, 0, x, 0, @@ -903,7 +1322,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Clean the data request background */ gdk_draw_rectangle (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, x, // do not overlap @@ -927,7 +1346,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) gdk_draw_rectangle (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap @@ -952,7 +1371,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) *old_time_window = *new_time_window; gdk_draw_rectangle (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->white_gc, + control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap @@ -971,6 +1390,8 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->height); } + + return 0; } @@ -1043,7 +1464,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) typedef struct _ClosureData { EventRequest *event_request; - LttvTraceState *ts; + LttvTracesetState *tss; } ClosureData; @@ -1068,78 +1489,139 @@ 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); + /* 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->middle->x = closure_data->event_request->x_begin; - g_critical("out middle x_beg : %u",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_debug("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_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); + } + PropertiesLine prop_line; prop_line.color = g_new(GdkColor,1); - prop_line.line_width = 6; + prop_line.line_width = 2; prop_line.style = GDK_LINE_SOLID; prop_line.position = MIDDLE; /* color of line : status of the process */ - if(process->state->s == LTTV_STATE_UNNAMED) + if(process != NULL) { - prop_line.color->red = 0x0000; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0x0000; - } - 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 = 0x0fff; - prop_line.color->green = 0x0fff; - 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 = 0x0000; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0x0000; + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; } draw_line((void*)&prop_line, (void*)draw_context); @@ -1196,7 +1678,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);