X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=22015eafffe26e5a10d6878ff023c651847134e6;hb=faf074a30c5aaf8c12214c5bd3446f85248acc04;hp=3adb5bc1684cfd7f2513d4dc2fa2c0dac8abb4c6;hpb=dbc0ef8affdb0c134871bd7b176bf034d912a1d3;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 3adb5bc1..22015eaf 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -45,6 +45,9 @@ * line/background. */ +#ifdef HAVE_CONFIG_H +#include +#endif //#define PANGO_ENABLE_BACKEND #include @@ -59,12 +62,14 @@ #include #include #include +#include #include #include #include #include #include +#include #include "eventhooks.h" @@ -75,61 +80,7 @@ #define MAX_PATH_LEN 256 - -#if 0 -typedef struct _ProcessAddClosure { - ControlFlowData *cfd; - guint trace_num; -} ProcessAddClosure; - -static void process_add(gpointer key, - gpointer value, - gpointer user_data) -{ - LttvProcessState *process = (LttvProcessState*)value; - ProcessAddClosure *closure = (ProcessAddClosure*)user_data; - ControlFlowData *control_flow_data = closure->cfd; - guint trace_num = closure->trace_num; - - /* Add process to process list (if not present) */ - guint pid; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - - ProcessList *process_list = control_flow_data->process_list; - - pid = process->pid; - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - HashedProcessData *hashed_process_data = NULL; - - if(processlist_get_process_pixels(process_list, - pid, - &birth, - trace_num, - &y, - &height, - &hashed_process_data) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid, - &birth, - trace_num, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - &birth, - trace_num, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); - } -} -#endif //0 +extern GSList *g_legend_list; /* Action to do when background computation completed. @@ -137,7 +88,7 @@ static void process_add(gpointer key, * Wait for all the awaited computations to be over. */ -gint background_ready(void *hook_data, void *call_data) +static gint background_ready(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData *)hook_data; LttvTrace *trace = (LttvTrace*)call_data; @@ -145,7 +96,7 @@ gint background_ready(void *hook_data, void *call_data) control_flow_data->background_info_waiting--; if(control_flow_data->background_info_waiting == 0) { - g_debug("control flow viewer : background computation data ready."); + g_message("control flow viewer : background computation data ready."); drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); @@ -162,7 +113,7 @@ gint background_ready(void *hook_data, void *call_data) /* Request background computation. Verify if it is in progress or ready first. * Only for each trace in the tab's traceset. */ -void request_background_data(ControlFlowData *control_flow_data) +static void request_background_data(ControlFlowData *control_flow_data) { LttvTracesetContext * tsc = lttvwindow_get_traceset_context(control_flow_data->tab); @@ -187,9 +138,9 @@ void request_background_data(ControlFlowData *control_flow_data) * information. Happens when two viewers ask for it before servicing * starts. */ - lttvwindowtraces_background_request_remove(trace, "state"); - lttvwindowtraces_background_request_queue(trace, - "state"); + if(!lttvwindowtraces_background_request_find(trace, "state")) + lttvwindowtraces_background_request_queue( + main_window_get_widget(control_flow_data->tab), trace, "state"); lttvwindowtraces_background_notify_queue(control_flow_data, trace, ltt_time_infinite, @@ -207,7 +158,7 @@ void request_background_data(ControlFlowData *control_flow_data) } } else { /* Data ready. Be its nature, this viewer doesn't need to have - * its data ready hook called htere, because a background + * its data ready hook called there, because a background * request is always linked with a redraw. */ } @@ -232,7 +183,7 @@ GtkWidget * h_guicontrolflow(Tab *tab) { g_info("h_guicontrolflow, %p", tab); - ControlFlowData *control_flow_data = guicontrolflow() ; + ControlFlowData *control_flow_data = guicontrolflow(tab) ; control_flow_data->tab = tab; @@ -260,6 +211,46 @@ h_guicontrolflow(Tab *tab) } +void legend_destructor(GtkWindow *legend) +{ + g_legend_list = g_slist_remove(g_legend_list, legend); +} + +/* Create a popup legend */ +GtkWidget * +h_legend(Tab *tab) +{ + g_info("h_legend, %p", tab); + + GtkWindow *legend = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL)); + + g_legend_list = g_slist_append( + g_legend_list, + legend); + + g_object_set_data_full( + G_OBJECT(legend), + "legend", + legend, + (GDestroyNotify)legend_destructor); + + gtk_window_set_title(legend, "Control Flow View Legend"); + + GtkWidget *pixmap = create_pixmap(GTK_WIDGET(legend), "lttv-color-list.png"); + + // GtkImage *image = GTK_IMAGE(gtk_image_new_from_pixmap( + // GDK_PIXMAP(pixmap), NULL)); + + gtk_container_add(GTK_CONTAINER(legend), GTK_WIDGET(pixmap)); + + gtk_widget_show(GTK_WIDGET(pixmap)); + gtk_widget_show(GTK_WIDGET(legend)); + + + return NULL; /* This is a popup window */ +} + + int event_selected_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; @@ -288,6 +279,8 @@ static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) prop_line.color = drawing_colors[COL_RUN_TRAP]; else if(process->state->t == LTTV_STATE_IRQ) prop_line.color = drawing_colors[COL_RUN_IRQ]; + else if(process->state->t == LTTV_STATE_SOFT_IRQ) + prop_line.color = drawing_colors[COL_RUN_SOFT_IRQ]; else if(process->state->t == LTTV_STATE_MODE_UNKNOWN) prop_line.color = drawing_colors[COL_MODE_UNKNOWN]; else @@ -314,46 +307,6 @@ static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) } -#if 0 -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; - -} -#endif //0 - /* before_schedchange_hook * @@ -375,15 +328,17 @@ static inline PropertiesLine prepare_status_line(LttvProcessState *process) int before_schedchange_hook(void *hook_data, void *call_data) { - EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); @@ -395,12 +350,8 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); + pid_out = ltt_event_get_long_unsigned(e, thf->f1); + pid_in = ltt_event_get_long_unsigned(e, thf->f2); } { @@ -410,12 +361,12 @@ int before_schedchange_hook(void *hook_data, void *call_data) * 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; + guint cpu = ltt_tracefile_num(tfc->tf); + LttvProcessState *process = ts->running_process[cpu]; /* unknown state, bad current pid */ - if(tfs->process->pid != pid_out) - process = lttv_state_find_process(tfs, pid_out); - else - process = tfs->process; + if(process->pid != pid_out) + process = lttv_state_find_process(ts, + ltt_tracefile_num(tfc->tf), pid_out); if(process != NULL) { /* Well, the process_out existed : we must get it in the process hash @@ -429,24 +380,23 @@ int before_schedchange_hook(void *hook_data, void *call_data) hashed_process_data = processlist_get_process_data(process_list, pid_out, - process->last_cpu_index, + process->cpu, &birth, tfc->t_context->index); if(hashed_process_data == NULL) { g_assert(pid_out == 0 || pid_out != process->ppid); - const gchar *name = g_quark_to_string(process->name); /* Process not present */ ProcessInfo *process_info; Drawing_t *drawing = control_flow_data->drawing; processlist_add(process_list, drawing, pid_out, - process->last_cpu_index, + process->cpu, process->ppid, &birth, tfc->t_context->index, - name, + process->name, &pl_height, &process_info, &hashed_process_data); @@ -571,10 +521,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) * 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); + process = lttv_state_find_process(ts, + ltt_tracefile_num(tfc->tf), pid_in); if(process != NULL) { - /* Well, the process_out existed : we must get it in the process hash + /* Well, the process existed : we must get it in the process hash * or add it, and draw its items. */ /* Add process to process list (if not present) */ @@ -585,24 +536,23 @@ int before_schedchange_hook(void *hook_data, void *call_data) hashed_process_data = processlist_get_process_data(process_list, pid_in, - process->last_cpu_index, + ltt_tracefile_num(tfc->tf), &birth, tfc->t_context->index); if(hashed_process_data == NULL) { g_assert(pid_in == 0 || pid_in != process->ppid); - const gchar *name = g_quark_to_string(process->name); /* Process not present */ ProcessInfo *process_info; Drawing_t *drawing = control_flow_data->drawing; processlist_add(process_list, drawing, pid_in, - process->last_cpu_index, + ltt_tracefile_num(tfc->tf), process->ppid, &birth, tfc->t_context->index, - name, + process->name, &pl_height, &process_info, &hashed_process_data); @@ -720,595 +670,12 @@ int before_schedchange_hook(void *hook_data, void *call_data) &hashed_process_data->next_good_time); } } - } + } else + g_warning("Cannot find pin_in in schedchange %u", pid_in); } return 0; -#if 0 - EventsRequest *events_request = (EventsRequest*)hook_data; - ControlFlowData *control_flow_data = - (ControlFlowData*)events_request->viewer_data; - Tab *tab = control_flow_data->tab; - - 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(tab); - - LttTime time_window.end_time = time_window.time_window.end_time; - - //if(time < time_beg || time > time_end) return; - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, time_window.end_time) == 1) - return; - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) - { - g_debug("schedchange!"); - - /* Add process to process list (if not present) and get drawing "y" from - * process position */ - guint pid_out, pid_in; - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - - ProcessList *process_list = control_flow_data->process_list; - - - 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_out in the list... */ - process_out = lttv_state_find_process(tfs, pid_out); - if(process_out == NULL) return 0; - g_debug("out : %s",g_quark_to_string(process_out->state->s)); - - birth = process_out->creation_time; - const gchar *name = g_quark_to_string(process_out->name); - HashedProcessData *hashed_process_data_out = NULL; - - if(processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid_out, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_out); - g_assert(processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out)==0); - drawing_insert_square( control_flow_data->drawing, y_out, height); - } - //g_free(name); - - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - if(process_in == NULL) return 0; - g_debug("in : %s",g_quark_to_string(process_in->state->s)); - - birth = process_in->creation_time; - name = g_quark_to_string(process_in->name); - HashedProcessData *hashed_process_data_in = NULL; - - 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, - 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); - - drawing_insert_square( control_flow_data->drawing, y_in, height); - } - //g_free(name); - - - /* Find pixels corresponding to time of the event. 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; - - LttTime time = ltt_event_time(e); - - LttTime window_end = time_window.time_window.end_time; - - convert_time_to_pixels( - time_window, - time, - width, - &x); - //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 = 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 = - control_flow_data->drawing->damage_begin; - draw_context_out->previous->middle->x = - control_flow_data->drawing->damage_begin; - draw_context_out->previous->under->x = - control_flow_data->drawing->damage_begin; - g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_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); - draw_context_out->gc = control_flow_data->drawing->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, 0x0000, 0x0000, 0x0000 }; - PropertiesText prop_text_out; - prop_text_out.foreground = &colorfg_out; - prop_text_out.background = &colorbg_out; - 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_ZOMBIE) - { - 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->"; - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - 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_ZOMBIE) - prop_text_out.text = "E->"; - else if(process_out->state->s == LTTV_STATE_WAIT) - prop_text_out.text = "W->"; - else if(process_out->state->s == LTTV_STATE_RUN) - 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); - - //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 = control_flow_data->drawing->gc; - - PropertiesLine prop_line_out; - prop_line_out.color = g_new(GdkColor,1); - 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 = 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 = 0xffff; - prop_line_out.color->blue = 0xfff0; - } - else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - { - 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_ZOMBIE) - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT) - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_RUN) - { - prop_line_out.color->red = 0x0000; - prop_line_out.color->green = 0xffff; - prop_line_out.color->blue = 0x0000; - } - else - { - 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); - g_free(prop_line_out.color); - //gdk_gc_unref(draw_context_out->gc); - /* Note : finishing line will have to be added when trace read over. */ - - /* Finally, update the drawing context of the pid_in. */ - - 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_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->over->x = - control_flow_data->drawing->damage_begin; - draw_context_in->previous->middle->x = - control_flow_data->drawing->damage_begin; - draw_context_in->previous->under->x = - control_flow_data->drawing->damage_begin; - - g_debug("in middle x_beg : %u",control_flow_data->drawing->damage_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); - draw_context_in->gc = control_flow_data->drawing->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; - prop_text_in.foreground = &colorfg_in; - prop_text_in.background = &colorbg_in; - 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_ZOMBIE) - { - 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->"; - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - 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_ZOMBIE) - prop_text_in.text = "E->"; - else if(process_in->state->s == LTTV_STATE_WAIT) - prop_text_in.text = "W->"; - else if(process_in->state->s == LTTV_STATE_RUN) - 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_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 = control_flow_data->drawing->gc; - - PropertiesLine prop_line_in; - prop_line_in.color = g_new(GdkColor,1); - 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 = 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 = 0xffff; - prop_line_in.color->blue = 0xfff0; - } - else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - { - 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_ZOMBIE) - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT) - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_RUN) - { - prop_line_in.color->red = 0x0000; - prop_line_in.color->green = 0xffff; - prop_line_in.color->blue = 0x0000; - } - else - { - 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); - g_free(prop_line_in.color); - //gdk_gc_unref(draw_context_in->gc); - } - - return 0; -#endif //0 - /* Text dump */ @@ -1345,15 +712,18 @@ int before_schedchange_hook(void *hook_data, void *call_data) */ int after_schedchange_hook(void *hook_data, void *call_data) { - EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); @@ -1368,18 +738,16 @@ int after_schedchange_hook(void *hook_data, void *call_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); + pid_out = ltt_event_get_long_unsigned(e, thf->f1); + pid_in = ltt_event_get_long_unsigned(e, thf->f2); } /* Find process pid_in in the list... */ - //process_in = lttv_state_find_process(tfs, pid_in); - process_in = tfs->process; + //process_in = lttv_state_find_process(ts, ANY_CPU, pid_in); + //process_in = tfs->process; + guint cpu = ltt_tracefile_num(tfc->tf); + process_in = ts->running_process[cpu]; /* It should exist, because we are after the state update. */ #ifdef EXTRA_CHECK g_assert(process_in != NULL); @@ -1388,24 +756,23 @@ int after_schedchange_hook(void *hook_data, void *call_data) hashed_process_data_in = processlist_get_process_data(process_list, pid_in, - process_in->last_cpu_index, + process_in->cpu, &birth, tfc->t_context->index); if(hashed_process_data_in == NULL) { g_assert(pid_in == 0 || pid_in != process_in->ppid); - const gchar *name = g_quark_to_string(process_in->name); ProcessInfo *process_info; Drawing_t *drawing = control_flow_data->drawing; /* Process not present */ processlist_add(process_list, drawing, pid_in, - process_in->last_cpu_index, + process_in->cpu, process_in->ppid, &birth, tfc->t_context->index, - name, + process_in->name, &pl_height, &process_info, &hashed_process_data_in); @@ -1415,7 +782,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) gtk_widget_queue_draw(drawing->drawing_area); } /* Set the current process */ - process_list->current_hash_data[process_in->last_cpu_index] = + process_list->current_hash_data[process_in->cpu] = hashed_process_data_in; if(ltt_time_compare(hashed_process_data_in->next_good_time, @@ -1446,495 +813,11 @@ int after_schedchange_hook(void *hook_data, void *call_data) } } return 0; +} - -#if 0 - 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 time_window.end_time = time_window.time_window.end_time; - - //if(time < time_beg || time > time_end) return; - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, time_window.end_time) == 1) - return; - - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) - { - g_debug("schedchange!"); - - /* Add process to process list (if not present) and get drawing "y" from - * process position */ - guint pid_out, pid_in; - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - - ProcessList *process_list = control_flow_data->process_list; - - - 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_out in the list... */ - process_out = lttv_state_find_process(tfs, pid_out); - 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; - - if(processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out) == 1) - { - /* Process not present */ - 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); - drawing_insert_square( control_flow_data->drawing, y_out, height); - } - - g_free(name); - - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - 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)); - HashedProcessData *hashed_process_data_in = NULL; - - 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, - 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); - - drawing_insert_square( control_flow_data->drawing, y_in, height); - } - g_free(name); - - - /* Find pixels corresponding to time of the event. 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->drawing_area->allocation.width; - - //LttTime time = ltt_event_time(e); - - //LttTime window_end = time_window->time_window.end_time; - - - //convert_time_to_pixels( - // *time_window, - // time, - // width, - // &x); - - //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_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_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; - prop_text_out.foreground = &colorfg_out; - prop_text_out.background = &colorbg_out; - 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_ZOMBIE) - { - 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"; - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - 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_ZOMBIE) - prop_text_out.text = "E"; - else if(process_out->state->s == LTTV_STATE_WAIT) - prop_text_out.text = "W"; - else if(process_out->state->s == LTTV_STATE_RUN) - 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); - - 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) */ - g_free(draw_context_out->previous->modify_under); - g_free(draw_context_out->previous->modify_middle); - g_free(draw_context_out->previous->modify_over); - g_free(draw_context_out->previous->under); - g_free(draw_context_out->previous->middle); - g_free(draw_context_out->previous->over); - g_free(draw_context_out->previous); - - draw_context_out->previous = draw_context_out->current; - - draw_context_out->current = g_new(DrawInfo,1); - draw_context_out->current->over = g_new(ItemInfo,1); - draw_context_out->current->over->x = -1; - draw_context_out->current->over->y = -1; - draw_context_out->current->middle = g_new(ItemInfo,1); - draw_context_out->current->middle->x = -1; - draw_context_out->current->middle->y = -1; - draw_context_out->current->under = g_new(ItemInfo,1); - draw_context_out->current->under->x = -1; - draw_context_out->current->under->y = -1; - draw_context_out->current->modify_over = g_new(ItemInfo,1); - draw_context_out->current->modify_over->x = -1; - draw_context_out->current->modify_over->y = -1; - draw_context_out->current->modify_middle = g_new(ItemInfo,1); - draw_context_out->current->modify_middle->x = -1; - draw_context_out->current->modify_middle->y = -1; - draw_context_out->current->modify_under = g_new(ItemInfo,1); - draw_context_out->current->modify_under->x = -1; - draw_context_out->current->modify_under->y = -1; - draw_context_out->current->status = LTTV_STATE_UNNAMED; - - /* Finally, update the drawing context of the pid_in. */ - - 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_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; - prop_text_in.foreground = &colorfg_in; - prop_text_in.background = &colorbg_in; - 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_ZOMBIE) - { - 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"; - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - 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_ZOMBIE) - prop_text_in.text = "E"; - else if(process_in->state->s == LTTV_STATE_WAIT) - prop_text_in.text = "W"; - else if(process_in->state->s == LTTV_STATE_RUN) - prop_text_in.text = "R"; - else - prop_text_in.text = "U"; - - 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) */ - g_free(draw_context_in->previous->modify_under); - g_free(draw_context_in->previous->modify_middle); - g_free(draw_context_in->previous->modify_over); - g_free(draw_context_in->previous->under); - g_free(draw_context_in->previous->middle); - g_free(draw_context_in->previous->over); - g_free(draw_context_in->previous); - - draw_context_in->previous = draw_context_in->current; - - draw_context_in->current = g_new(DrawInfo,1); - draw_context_in->current->over = g_new(ItemInfo,1); - draw_context_in->current->over->x = -1; - draw_context_in->current->over->y = -1; - draw_context_in->current->middle = g_new(ItemInfo,1); - draw_context_in->current->middle->x = -1; - draw_context_in->current->middle->y = -1; - draw_context_in->current->under = g_new(ItemInfo,1); - draw_context_in->current->under->x = -1; - draw_context_in->current->under->y = -1; - draw_context_in->current->modify_over = g_new(ItemInfo,1); - draw_context_in->current->modify_over->x = -1; - draw_context_in->current->modify_over->y = -1; - draw_context_in->current->modify_middle = g_new(ItemInfo,1); - draw_context_in->current->modify_middle->x = -1; - draw_context_in->current->modify_middle->y = -1; - draw_context_in->current->modify_under = g_new(ItemInfo,1); - draw_context_in->current->modify_under->x = -1; - draw_context_in->current->modify_under->y = -1; - draw_context_in->current->status = LTTV_STATE_UNNAMED; - - } - - return 0; -#endif //0 -} - -#if 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; - -} -#endif //0 - - /* before_execmode_hook * * This function basically draw lines and icons. Two types of lines are drawn : @@ -1955,15 +838,18 @@ static inline PropertiesLine prepare_execmode_line(LttvProcessState *process) int before_execmode_hook(void *hook_data, void *call_data) { - EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); @@ -1972,7 +858,9 @@ int before_execmode_hook(void *hook_data, void *call_data) * time to do it. */ /* For the pid */ - LttvProcessState *process = tfs->process; + //LttvProcessState *process = tfs->process; + guint cpu = ltt_tracefile_num(tfc->tf); + LttvProcessState *process = ts->running_process[cpu]; g_assert(process != NULL); guint pid = process->pid; @@ -1986,12 +874,12 @@ int before_execmode_hook(void *hook_data, void *call_data) ProcessList *process_list = control_flow_data->process_list; LttTime birth = process->creation_time; - if(likely(process_list->current_hash_data[tfc->index] != NULL)) { - hashed_process_data = process_list->current_hash_data[tfc->index]; + if(likely(process_list->current_hash_data[cpu] != NULL)) { + hashed_process_data = process_list->current_hash_data[cpu]; } else { hashed_process_data = processlist_get_process_data(process_list, pid, - process->last_cpu_index, + process->cpu, &birth, tfc->t_context->index); if(unlikely(hashed_process_data == NULL)) @@ -2000,15 +888,14 @@ int before_execmode_hook(void *hook_data, void *call_data) ProcessInfo *process_info; /* Process not present */ Drawing_t *drawing = control_flow_data->drawing; - const gchar *name = g_quark_to_string(process->name); processlist_add(process_list, drawing, pid, - process->last_cpu_index, + process->cpu, process->ppid, &birth, tfc->t_context->index, - name, + process->name, &pl_height, &process_info, &hashed_process_data); @@ -2018,7 +905,7 @@ int before_execmode_hook(void *hook_data, void *call_data) gtk_widget_queue_draw(drawing->drawing_area); } /* Set the current process */ - process_list->current_hash_data[process->last_cpu_index] = + process_list->current_hash_data[process->cpu] = hashed_process_data; } @@ -2131,92 +1018,117 @@ int before_execmode_hook(void *hook_data, void *call_data) return 0; } -/* after_execmode_hook +/* before_process_exit_hook * - * The draw after hook is called by the reading API to have a - * particular event drawn on the screen. + * 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 after_execmode_hook(void *hook_data, void *call_data) -{ - /**************** DOES NOTHING!! *************/ - /* hook desactivated in drawing.c */ - return 0; +int before_process_exit_hook(void *hook_data, void *call_data) +{ + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_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 *)tfc->t_context; + LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); /* Add process to process list (if not present) */ - LttvProcessState *process; + //LttvProcessState *process = tfs->process; + guint cpu = ltt_tracefile_num(tfc->tf); + LttvProcessState *process = ts->running_process[cpu]; + guint pid = process->pid; LttTime birth; guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; - - /* 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; - if(likely(process_list->current_hash_data[tfc->index] != NULL)) { - hashed_process_data = process_list->current_hash_data[tfc->index]; + if(likely(process_list->current_hash_data[cpu] != NULL)) { + hashed_process_data = process_list->current_hash_data[cpu]; } else { hashed_process_data = processlist_get_process_data(process_list, - pid, - process->last_cpu_index, - &birth, - tfc->t_context->index); + pid, + process->cpu, + &birth, + tfc->t_context->index); if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ Drawing_t *drawing = control_flow_data->drawing; - const gchar *name = g_quark_to_string(process->name); ProcessInfo *process_info; processlist_add(process_list, drawing, pid, - process->last_cpu_index, + process->cpu, process->ppid, &birth, tfc->t_context->index, - name, + process->name, &pl_height, &process_info, &hashed_process_data); - gtk_widget_set_size_request(drawing->drawing_area, - -1, - pl_height); - gtk_widget_queue_draw(drawing->drawing_area); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } - /* Set the current process */ - process_list->current_hash_data[process->last_cpu_index] = - hashed_process_data; } - if(unlikely(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0)) + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ + + if(likely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0)) { + if(unlikely(hashed_process_data->x.middle_marked == FALSE)) { + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; + guint x; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); + + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(hashed_process_data->pixmap, + drawing->gc, + x, + (hashed_process_data->height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + } else { TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2227,26 +1139,75 @@ int after_execmode_hook(void *hook_data, void *call_data) #endif //EXTRA_CHECK Drawing_t *drawing = control_flow_data->drawing; guint width = drawing->width; - guint new_x; - + guint x; + convert_time_to_pixels( time_window, evtime, width, - &new_x); + &x); - if(hashed_process_data->x.middle != new_x) { - hashed_process_data->x.middle = new_x; - hashed_process_data->x.middle_used = FALSE; + + /* Jump over draw if we are at the same x position */ + if(unlikely(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used)) + { + if(unlikely(hashed_process_data->x.middle_marked == FALSE)) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(hashed_process_data->pixmap, + drawing->gc, + x, + (hashed_process_data->height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + /* jump */ + } else { + DrawContext draw_context; + + /* Now create the drawing context that will be used to draw + * items related to the last state. */ + draw_context.drawable = hashed_process_data->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 = 1; + draw_context.drawinfo.y.middle = (hashed_process_data->height/2); + draw_context.drawinfo.y.under = hashed_process_data->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_s_e_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); + + } + /* become the last x position */ + hashed_process_data->x.middle = x; + hashed_process_data->x.middle_used = TRUE; hashed_process_data->x.middle_marked = FALSE; + + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); } } + return 0; + } -/* before_process_hook +/* before_process_release_hook * * Draw lines for process event. * @@ -2256,74 +1217,75 @@ int after_execmode_hook(void *hook_data, void *call_data) * This function adds items to be drawn in a queue for each process. * */ -int before_process_hook(void *hook_data, void *call_data) + + +int before_process_release_hook(void *hook_data, void *call_data) { - EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - guint sub_id; + + guint pid; { - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - sub_id = ltt_event_get_long_unsigned(e,element); + pid = ltt_event_get_long_unsigned(e, thf->f1); } - if(sub_id == 3) { /* exit */ + /* Add process to process list (if not present) */ + /* Don't care about the process if it's not in the state hash already : + * that means a process that has never done anything in the trace and + * unknown suddently gets destroyed : no state meaningful to show. */ + LttvProcessState *process = lttv_state_find_process(ts, ANY_CPU, pid); - /* Add process to process list (if not present) */ - LttvProcessState *process = tfs->process; - guint pid = process->pid; + if(process != NULL) { LttTime birth; guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; - g_assert(process != NULL); - birth = process->creation_time; - if(likely(process_list->current_hash_data[tfc->index] != NULL)) { - hashed_process_data = process_list->current_hash_data[tfc->index]; - } else { - hashed_process_data = processlist_get_process_data(process_list, - pid, - process->last_cpu_index, - &birth, - tfc->t_context->index); - if(unlikely(hashed_process_data == NULL)) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - Drawing_t *drawing = control_flow_data->drawing; - const gchar *name = g_quark_to_string(process->name); - ProcessInfo *process_info; - processlist_add(process_list, - drawing, - pid, - process->last_cpu_index, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &process_info, - &hashed_process_data); - gtk_widget_set_size_request(drawing->drawing_area, - -1, - pl_height); - gtk_widget_queue_draw(drawing->drawing_area); - } + /* Cannot use current process : this event happens on another process, + * action done by the parent. */ + hashed_process_data = processlist_get_process_data(process_list, + pid, + process->cpu, + &birth, + tfc->t_context->index); + if(unlikely(hashed_process_data == NULL)) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; + ProcessInfo *process_info; + processlist_add(process_list, + drawing, + pid, + process->cpu, + process->ppid, + &birth, + tfc->t_context->index, + process->name, + &pl_height, + &process_info, + &hashed_process_data); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } /* Now, the process is in the state hash and our own process hash. @@ -2431,18 +1393,16 @@ int before_process_hook(void *hook_data, void *call_data) &hashed_process_data->next_good_time); } } - } - return 0; + return 0; } - -/* after_process_hook +/* after_process_fork_hook * * Create the processlist entry for the child process. Put the last * position in x at the current time value. @@ -2453,201 +1413,298 @@ int before_process_hook(void *hook_data, void *call_data) * This function adds items to be drawn in a queue for each process. * */ -int after_process_hook(void *hook_data, void *call_data) +int after_process_fork_hook(void *hook_data, void *call_data) { - EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - guint sub_id; - guint param1; + guint child_pid; { - 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); + child_pid = ltt_event_get_long_unsigned(e, thf->f2); } - if(sub_id == 2) { /* fork */ - - guint child_pid = param1; - /* Add process to process list (if not present) */ - LttvProcessState *process_child; - LttTime birth; - guint pl_height = 0; - HashedProcessData *hashed_process_data_child = NULL; + /* Add process to process list (if not present) */ + LttvProcessState *process_child; + LttTime birth; + guint pl_height = 0; + HashedProcessData *hashed_process_data_child = NULL; - ProcessList *process_list = control_flow_data->process_list; + ProcessList *process_list = control_flow_data->process_list; + + /* Find child in the list... */ + process_child = lttv_state_find_process(ts, ANY_CPU, child_pid); + /* It should exist, because we are after the state update. */ + g_assert(process_child != NULL); + + birth = process_child->creation_time; + + /* Cannot use current process, because this action is done by the parent + * on its child. */ + hashed_process_data_child = processlist_get_process_data(process_list, + child_pid, + process_child->cpu, + &birth, + tfc->t_context->index); + if(likely(hashed_process_data_child == NULL)) + { + g_assert(child_pid == 0 || child_pid != process_child->ppid); + /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; + ProcessInfo *process_info; + processlist_add(process_list, + drawing, + child_pid, + process_child->cpu, + process_child->ppid, + &birth, + tfc->t_context->index, + process_child->name, + &pl_height, + &process_info, + &hashed_process_data_child); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); + } + + + if(likely(ltt_time_compare(hashed_process_data_child->next_good_time, + evtime) <= 0)) + { + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; + guint new_x; + convert_time_to_pixels( + time_window, + evtime, + width, + &new_x); + + if(likely(hashed_process_data_child->x.over != new_x)) { + hashed_process_data_child->x.over = new_x; + hashed_process_data_child->x.over_used = FALSE; + hashed_process_data_child->x.over_marked = FALSE; + } + if(likely(hashed_process_data_child->x.middle != new_x)) { + hashed_process_data_child->x.middle = new_x; + hashed_process_data_child->x.middle_used = FALSE; + hashed_process_data_child->x.middle_marked = FALSE; + } + if(likely(hashed_process_data_child->x.under != new_x)) { + hashed_process_data_child->x.under = new_x; + hashed_process_data_child->x.under_used = FALSE; + hashed_process_data_child->x.under_marked = FALSE; + } + } + return 0; +} + + + +/* after_process_exit_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_exit_hook(void *hook_data, void *call_data) +{ + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; + + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + + LttvTracefileState *tfs = (LttvTracefileState *)call_data; + + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + + LttEvent *e; + e = ltt_tracefile_get_event(tfc->tf); - /* 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); + LttTime evtime = ltt_event_time(e); + + /* Add process to process list (if not present) */ + //LttvProcessState *process = tfs->process; + guint cpu = ltt_tracefile_num(tfc->tf); + LttvProcessState *process = ts->running_process[cpu]; + + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); + + guint pid = process->pid; + LttTime birth; + guint pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + + ProcessList *process_list = control_flow_data->process_list; - birth = process_child->creation_time; + birth = process->creation_time; - hashed_process_data_child = processlist_get_process_data(process_list, - child_pid, - process_child->last_cpu_index, + if(likely(process_list->current_hash_data[cpu] != NULL) ){ + hashed_process_data = process_list->current_hash_data[cpu]; + } else { + hashed_process_data = processlist_get_process_data(process_list, + pid, + process->cpu, &birth, tfc->t_context->index); - if(likely(hashed_process_data_child == NULL)) + if(unlikely(hashed_process_data == NULL)) { - g_assert(child_pid == 0 || child_pid != process_child->ppid); + g_assert(pid == 0 || pid != process->ppid); /* Process not present */ Drawing_t *drawing = control_flow_data->drawing; - const gchar *name = g_quark_to_string(process_child->name); ProcessInfo *process_info; processlist_add(process_list, drawing, - child_pid, - process_child->last_cpu_index, - process_child->ppid, + pid, + process->cpu, + process->ppid, &birth, tfc->t_context->index, - name, + process->name, &pl_height, &process_info, - &hashed_process_data_child); - gtk_widget_set_size_request(drawing->drawing_area, - -1, - pl_height); - gtk_widget_queue_draw(drawing->drawing_area); + &hashed_process_data); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } + /* Set the current process */ + process_list->current_hash_data[process->cpu] = + hashed_process_data; + } - if(likely(ltt_time_compare(hashed_process_data_child->next_good_time, - evtime) <= 0)) - { - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); + if(unlikely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0)) + { + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); #ifdef EXTRA_CHECK - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, time_window.end_time) == 1) - return; + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; #endif //EXTRA_CHECK - Drawing_t *drawing = control_flow_data->drawing; - guint width = drawing->width; - guint new_x; - convert_time_to_pixels( - time_window, - evtime, - width, - &new_x); - - if(likely(hashed_process_data_child->x.over != new_x)) { - hashed_process_data_child->x.over = new_x; - hashed_process_data_child->x.over_used = FALSE; - hashed_process_data_child->x.over_marked = FALSE; - } - if(likely(hashed_process_data_child->x.middle != new_x)) { - hashed_process_data_child->x.middle = new_x; - hashed_process_data_child->x.middle_used = FALSE; - hashed_process_data_child->x.middle_marked = FALSE; - } - if(likely(hashed_process_data_child->x.under != new_x)) { - hashed_process_data_child->x.under = new_x; - hashed_process_data_child->x.under_used = FALSE; - hashed_process_data_child->x.under_marked = FALSE; - } + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; + guint new_x; + convert_time_to_pixels( + time_window, + evtime, + width, + &new_x); + if(unlikely(hashed_process_data->x.middle != new_x)) { + hashed_process_data->x.middle = new_x; + hashed_process_data->x.middle_used = FALSE; + hashed_process_data->x.middle_marked = FALSE; } + } - } else if(sub_id == 3) { /* exit */ + return 0; +} - /* Add process to process list (if not present) */ - LttvProcessState *process = tfs->process; - guint pid = process->pid; - LttTime birth; - guint pl_height = 0; - HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = control_flow_data->process_list; +/* Get the filename of the process to print */ +int after_fs_exec_hook(void *hook_data, void *call_data) +{ + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; - /* It should exist, because we are after the state update. */ - g_assert(process != NULL); + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; - birth = process->creation_time; + LttvTracefileState *tfs = (LttvTracefileState *)call_data; - if(likely(process_list->current_hash_data[tfc->index] != NULL) ){ - hashed_process_data = process_list->current_hash_data[tfc->index]; - } else { - hashed_process_data = processlist_get_process_data(process_list, - pid, - process->last_cpu_index, - &birth, - tfc->t_context->index); - if(unlikely(hashed_process_data == NULL)) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - Drawing_t *drawing = control_flow_data->drawing; - const gchar *name = g_quark_to_string(process->name); - ProcessInfo *process_info; - processlist_add(process_list, - drawing, + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + + guint cpu = ltt_tracefile_num(tfc->tf); + LttvProcessState *process = ts->running_process[cpu]; + 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 pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = control_flow_data->process_list; + LttTime birth = process->creation_time; + + if(likely(process_list->current_hash_data[cpu] != NULL)) { + hashed_process_data = process_list->current_hash_data[cpu]; + } else { + hashed_process_data = processlist_get_process_data(process_list, pid, - process->last_cpu_index, - process->ppid, + process->cpu, &birth, - tfc->t_context->index, - name, - &pl_height, - &process_info, - &hashed_process_data); + tfc->t_context->index); + if(unlikely(hashed_process_data == NULL)) + { + g_assert(pid == 0 || pid != process->ppid); + ProcessInfo *process_info; + /* Process not present */ + Drawing_t *drawing = control_flow_data->drawing; + processlist_add(process_list, + drawing, + pid, + process->cpu, + process->ppid, + &birth, + tfc->t_context->index, + process->name, + &pl_height, + &process_info, + &hashed_process_data); gtk_widget_set_size_request(drawing->drawing_area, -1, pl_height); gtk_widget_queue_draw(drawing->drawing_area); - } - - /* Set the current process */ - process_list->current_hash_data[process->last_cpu_index] = - hashed_process_data; } + /* Set the current process */ + process_list->current_hash_data[process->cpu] = + hashed_process_data; + } - if(unlikely(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0)) - { - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - -#ifdef EXTRA_CHECK - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, time_window.end_time) == 1) - return; -#endif //EXTRA_CHECK - Drawing_t *drawing = control_flow_data->drawing; - guint width = drawing->width; - guint new_x; - convert_time_to_pixels( - time_window, - evtime, - width, - &new_x); - if(unlikely(hashed_process_data->x.middle != new_x)) { - hashed_process_data->x.middle = new_x; - hashed_process_data->x.middle_used = FALSE; - hashed_process_data->x.middle_marked = FALSE; - } - } + processlist_set_name(process_list, process->name, hashed_process_data); - } return 0; } + + gint update_time_window_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; @@ -2860,8 +1917,10 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->height); } + /* Update directly when scrolling */ + gdk_window_process_updates(control_flow_data->drawing->drawing_area->window, + TRUE); - return 0; } @@ -2870,6 +1929,12 @@ gint traceset_notify(void *hook_data, void *call_data) ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; + if(unlikely(drawing->gc == NULL)) { + return FALSE; + } + if(drawing->dotted_gc == NULL) { + return FALSE; + } drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); @@ -2907,7 +1972,7 @@ gint redraw_notify(void *hook_data, void *call_data) -1); gtk_widget_queue_draw(drawing->drawing_area); - + if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, @@ -3022,8 +2087,11 @@ gint update_current_time_hook(void *hook_data, void *call_data) } gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); - + /* Update directly when scrolling */ + gdk_window_process_updates(control_flow_data->drawing->drawing_area->window, + TRUE); + return 0; } @@ -3059,13 +2127,30 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) #ifdef EXTRA_CHECK g_assert(lttv_traceset_number(tsc->ts) > 0); #endif //EXTRA_CHECK - /* 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]; + LttvTraceContext *tc = tsc->traces[process_info->trace_num]; + LttvTraceState *ts = (LttvTraceState*)tc; +#if 0 + //FIXME : optimize data structures. + LttvTracefileState *tfs; + LttvTracefileContext *tfc; + guint i; + for(i=0;itracefiles->len;i++) { + tfc = g_array_index(tc->tracefiles, LttvTracefileContext*, i); + if(ltt_tracefile_name(tfc->tf) == LTT_NAME_CPU + && ltt_tracefile_num(tfc->tf) == process_info->cpu) + break; + + } + g_assert(itracefiles->len); + tfs = LTTV_TRACEFILE_STATE(tfc); +#endif //0 + // LttvTracefileState *tfs = + // (LttvTracefileState*)tsc->traces[process_info->trace_num]-> + // tracefiles[process_info->cpu]; + LttvProcessState *process; - process = lttv_state_find_process(tfs, + process = lttv_state_find_process(ts, process_info->cpu, process_info->pid); if(unlikely(process != NULL)) {