X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=e5b66cc9722b438059ed23d72dbcd74084c7bfe7;hb=e7f5e89d1b5a36b99c24b738f446923a72966b3c;hp=c422e3e9e48ef24172eedad51ae3b3e2f8a6fd2e;hpb=dbd243b1b5f764129ae8bcf95432df750bec4a8b;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 c422e3e9..e5b66cc9 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,6 +62,7 @@ #include #include #include +#include #include #include @@ -71,12 +75,10 @@ #include "cfv.h" #include "processlist.h" #include "drawing.h" -#include "cfv-private.h" #define MAX_PATH_LEN 256 - #if 0 typedef struct _ProcessAddClosure { ControlFlowData *cfd; @@ -97,8 +99,7 @@ static void process_add(gpointer key, LttTime birth; guint y = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; pid = process->pid; birth = process->creation_time; @@ -143,8 +144,6 @@ gint background_ready(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData *)hook_data; LttvTrace *trace = (LttvTrace*)call_data; - LttvTracesetContext *tsc = - lttvwindow_get_traceset_context(control_flow_data->tab); control_flow_data->background_info_waiting--; @@ -153,6 +152,9 @@ gint background_ready(void *hook_data, void *call_data) drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); + gtk_widget_set_size_request( + control_flow_data->drawing->drawing_area, + -1, processlist_get_height(control_flow_data->process_list)); redraw_notify(control_flow_data, NULL); } @@ -206,7 +208,13 @@ void request_background_data(ControlFlowData *control_flow_data) background_ready_hook); control_flow_data->background_info_waiting++; } + } else { + /* Data ready. Be its nature, this viewer doesn't need to have + * its data ready hook called htere, because a background + * request is always linked with a redraw. + */ } + } lttv_hooks_destroy(background_ready_hook); @@ -231,7 +239,6 @@ h_guicontrolflow(Tab *tab) control_flow_data->tab = tab; - //g_debug("time width2 : %u",time_window->time_width); // Unreg done in the GuiControlFlow_Destructor lttvwindow_register_traceset_notify(tab, traceset_notify, @@ -249,7 +256,7 @@ h_guicontrolflow(Tab *tab) lttvwindow_register_continue_notify(tab, continue_notify, control_flow_data); - request_background_data(control_flow_data); + //request_background_data(control_flow_data); return guicontrolflow_get_widget(control_flow_data) ; @@ -263,10 +270,55 @@ int event_selected_hook(void *hook_data, void *call_data) g_debug("DEBUG : event selected by main window : %u", *event_number); + return 0; } +/* Function that selects the color of status&exemode line */ +static inline PropertiesLine prepare_s_e_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(); + + if(process->state->s == LTTV_STATE_RUN) { + if(process->state->t == LTTV_STATE_USER_MODE) + prop_line.color = drawing_colors[COL_RUN_USER_MODE]; + else if(process->state->t == LTTV_STATE_SYSCALL) + prop_line.color = drawing_colors[COL_RUN_SYSCALL]; + else if(process->state->t == LTTV_STATE_TRAP) + 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_MODE_UNKNOWN) + prop_line.color = drawing_colors[COL_MODE_UNKNOWN]; + else + g_assert(FALSE); /* RUNNING MODE UNKNOWN */ + } else if(process->state->s == LTTV_STATE_WAIT) { + /* We don't show if we wait while in user mode, trap, irq or syscall */ + prop_line.color = drawing_colors[COL_WAIT]; + } else if(process->state->s == LTTV_STATE_WAIT_CPU) { + /* We don't show if we wait for CPU while in user mode, trap, irq + * or syscall */ + prop_line.color = drawing_colors[COL_WAIT_CPU]; + } else if(process->state->s == LTTV_STATE_ZOMBIE) { + prop_line.color = drawing_colors[COL_ZOMBIE]; + } else if(process->state->s == LTTV_STATE_WAIT_FORK) { + prop_line.color = drawing_colors[COL_WAIT_FORK]; + } else if(process->state->s == LTTV_STATE_EXIT) { + prop_line.color = drawing_colors[COL_EXIT]; + } else if(process->state->s == LTTV_STATE_UNNAMED) { + prop_line.color = drawing_colors[COL_UNNAMED]; + } else + g_assert(FALSE); /* UNKNOWN STATE */ + + return prop_line; + +} -static __inline PropertiesLine prepare_status_line(LttvProcessState *process) +#if 0 +static inline PropertiesLine prepare_status_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 2; @@ -303,7 +355,7 @@ static __inline PropertiesLine prepare_status_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_schedchange_hook @@ -326,135 +378,164 @@ 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; - Drawing_t *drawing = control_flow_data->drawing; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - - guint width = drawing->width; - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { - - /* we are in a schedchange, before the state update. We must draw the - * items corresponding to the state before it changes : now is the right - * time to do it. - */ + /* we are in a schedchange, before the state update. We must draw the + * items corresponding to the state before it changes : now is the right + * time to do it. + */ - guint pid_out; - guint pid_in; - { - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - pid_out = ltt_event_get_long_unsigned(e,element); - element = ltt_field_member(f,1); - pid_in = ltt_event_get_long_unsigned(e,element); - g_debug("out : %u in : %u", pid_out, pid_in); - } - - { - /* For the pid_out */ - /* First, check if the current process is in the state computation - * process list. If it is there, that means we must add it right now and - * draw items from the beginning of the read for it. If it is not - * present, it's a new process and it was not present : it will - * be added after the state update. */ - LttvProcessState *process; + guint pid_out; + guint pid_in; + { + pid_out = ltt_event_get_long_unsigned(e, thf->f1); + pid_in = ltt_event_get_long_unsigned(e, thf->f2); + } + + { + /* For the pid_out */ + /* First, check if the current process is in the state computation + * process list. If it is there, that means we must add it right now and + * draw items from the beginning of the read for it. If it is not + * present, it's a new process and it was not present : it will + * be added after the state update. */ + LttvProcessState *process; + /* 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 != NULL) { + /* Well, the process_out existed : we must get it in the process hash + * or add it, and draw its items. + */ + /* Add process to process list (if not present) */ + guint pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = control_flow_data->process_list; + LttTime birth = process->creation_time; - if(process != NULL) { - /* Well, the process_out existed : we must get it in the process hash - * or add it, and draw its items. - */ - /* Add process to process list (if not present) */ - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - LttTime birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - - if(processlist_get_process_pixels(process_list, - pid_out, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid_out == 0 || pid_out != process->ppid); - /* Process not present */ - processlist_add(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid_out, - process->last_cpu, - process->ppid, + process->last_cpu_index, &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_out, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( drawing, y, height); - } + 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->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); + + } + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ - /* Now, the process is in the state hash and our own process hash. - * We definitely can draw the items related to the ending state. - */ - - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.middle != -1); - { + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0) + { + if(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; - DrawContext draw_context; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); + 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); +#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); + + + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) + { + if(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 = drawing->pixmap; + 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 = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + 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; @@ -465,101 +546,155 @@ int before_schedchange_hook(void *hook_data, void *call_data) { /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); + 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); } } } + } - { - /* For the pid_in */ - /* First, check if the current process is in the state computation - * process list. If it is there, that means we must add it right now and - * draw items from the beginning of the read for it. If it is not - * present, it's a new process and it was not present : it will - * be added after the state update. */ - LttvProcessState *process; - process = lttv_state_find_process(tfs, pid_in); + { + /* For the pid_in */ + /* First, check if the current process is in the state computation + * process list. If it is there, that means we must add it right now and + * draw items from the beginning of the read for it. If it is not + * present, it's a new process and it was not present : it will + * be added after the state update. */ + LttvProcessState *process; + process = lttv_state_find_process(tfs, pid_in); + + if(process != NULL) { + /* Well, the process_out existed : we must get it in the process hash + * or add it, and draw its items. + */ + /* Add process to process list (if not present) */ + guint pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = control_flow_data->process_list; + LttTime birth = process->creation_time; - if(process != NULL) { - /* Well, the process_out existed : we must get it in the process hash - * or add it, and draw its items. - */ - /* Add process to process list (if not present) */ - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - LttTime birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - - if(processlist_get_process_pixels(process_list, - pid_in, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid_in == 0 || pid_in != process->ppid); - /* Process not present */ - processlist_add(process_list, + hashed_process_data = processlist_get_process_data(process_list, pid_in, - process->last_cpu, - process->ppid, + process->last_cpu_index, &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_in, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( drawing, y, height); - } + 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, + 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); + + } + //We could set the current process and hash here, but will be done + //by after schedchange hook + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ - /* Now, the process is in the state hash and our own process hash. - * We definitely can draw the items related to the ending state. - */ - - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.middle != -1); - { - guint x; - DrawContext draw_context; + if(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0) + { + if(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.start_time, - end_time, - evtime, - width, - &x); + 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); +#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); + + + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used) + { + if(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 = drawing->pixmap; + 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 = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + 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; @@ -570,13 +705,19 @@ int before_schedchange_hook(void *hook_data, void *call_data) { /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); + 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); } } } @@ -602,11 +743,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + 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, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) @@ -620,8 +761,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttTime birth; guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttField *f = ltt_event_field(e); @@ -714,13 +854,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) LttTime time = ltt_event_time(e); - LttTime window_end = ltt_time_add(time_window.time_width, - time_window.start_time); - + LttTime window_end = time_window.time_window.end_time; convert_time_to_pixels( - time_window.start_time, - window_end, + time_window, time, width, &x); @@ -753,7 +890,6 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); } @@ -779,7 +915,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) PropertiesBG prop_bg; prop_bg.color = g_new(GdkColor,1); - switch(tfc->index) { + switch(ltt_tracefile_num(tfc->tf)) { case 0: prop_bg.color->red = 0x1515; prop_bg.color->green = 0x1515; @@ -1002,7 +1138,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) PropertiesBG prop_bg; prop_bg.color = g_new(GdkColor,1); - switch(tfc->index) { + switcht(ltt_tracefile_num(tfc->tf)) { case 0: prop_bg.color->red = 0x1515; prop_bg.color->green = 0x1515; @@ -1209,108 +1345,109 @@ 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 *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - guint width = control_flow_data->drawing->width; - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { + /* Add process to process list (if not present) */ + LttvProcessState *process_in; + LttTime birth; + guint pl_height = 0; + HashedProcessData *hashed_process_data_in = NULL; - g_debug("schedchange!"); - - { - /* Add process to process list (if not present) */ - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data_in = NULL; + ProcessList *process_list = control_flow_data->process_list; + + guint pid_in; + { + guint pid_out; + pid_out = ltt_event_get_long_unsigned(e, thf->f1); + pid_in = ltt_event_get_long_unsigned(e, thf->f2); + } - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - - guint pid_in; - { - guint pid_out; - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - pid_out = ltt_event_get_long_unsigned(e,element); - element = ltt_field_member(f,1); - pid_in = ltt_event_get_long_unsigned(e,element); - g_debug("out : %u in : %u", pid_out, pid_in); - } + /* Find process pid_in in the list... */ + //process_in = lttv_state_find_process(tfs, pid_in); + process_in = tfs->process; + /* It should exist, because we are after the state update. */ +#ifdef EXTRA_CHECK + g_assert(process_in != NULL); +#endif //EXTRA_CHECK + birth = process_in->creation_time; - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - /* It should exist, because we are after the state update. */ - g_assert(process_in != NULL); + hashed_process_data_in = processlist_get_process_data(process_list, + pid_in, + process_in->last_cpu_index, + &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->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &process_info, + &hashed_process_data_in); + 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_in->last_cpu_index] = + hashed_process_data_in; - birth = process_in->creation_time; - const gchar *name = g_quark_to_string(process_in->name); + if(ltt_time_compare(hashed_process_data_in->next_good_time, + evtime) <= 0) + { + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); - if(processlist_get_process_pixels(process_list, - pid_in, - process_in->last_cpu, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in) == 1) - { - g_assert(pid_in == 0 || pid_in != process_in->ppid); - /* Process not present */ - processlist_add(process_list, - pid_in, - process_in->last_cpu, - process_in->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_in); - processlist_get_process_pixels(process_list, - pid_in, - process_in->last_cpu, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in); - drawing_insert_square( control_flow_data->drawing, y_in, height); - } +#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); - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data_in->x.middle); + if(hashed_process_data_in->x.middle != new_x) { + hashed_process_data_in->x.middle = new_x; + hashed_process_data_in->x.middle_used = FALSE; + hashed_process_data_in->x.middle_marked = FALSE; } } return 0; + + #if 0 EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; @@ -1328,11 +1465,11 @@ int after_schedchange_hook(void *hook_data, void *call_data) TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + 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, end_time) == 1) + || ltt_time_compare(evtime, time_window.end_time) == 1) return; @@ -1347,8 +1484,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) LttTime birth; guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttField *f = ltt_event_field(e); @@ -1442,13 +1578,11 @@ int after_schedchange_hook(void *hook_data, void *call_data) //LttTime time = ltt_event_time(e); - //LttTime window_end = ltt_time_add(time_window->time_width, - // time_window->start_time); + //LttTime window_end = time_window->time_window.end_time; //convert_time_to_pixels( - // time_window->start_time, - // window_end, + // *time_window, // time, // width, // &x); @@ -1713,7 +1847,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) prop_text_in.text = g_new(gchar, 260); strcpy(prop_text_in.text, "CPU "); - snprintf(tmp, 255, "%u", tfc->index); + snprintf(tmp, 255, "%u", ltt_tracefile_num(tfc->tf)); strcat(prop_text_in.text, tmp); draw_text((void*)&prop_text_in, (void*)draw_context_in); @@ -1764,7 +1898,8 @@ int after_schedchange_hook(void *hook_data, void *call_data) #endif //0 } -static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) +#if 0 +static inline PropertiesLine prepare_execmode_line(LttvProcessState *process) { PropertiesLine prop_line; prop_line.line_width = 1; @@ -1794,7 +1929,7 @@ static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_execmode_hook @@ -1817,123 +1952,155 @@ 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; - Drawing_t *drawing = control_flow_data->drawing; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - - guint width = drawing->width; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"syscall_entry") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"syscall_exit") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"trap_entry") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"trap_exit") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"irq_entry") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"irq_exit") == 0 - ) { - - /* we are in a execmode, before the state update. We must draw the - * items corresponding to the state before it changes : now is the right - * time to do it. - */ - /* For the pid */ - LttvProcessState *process = tfs->process; - g_assert(process != NULL); + /* we are in a execmode, before the state update. We must draw the + * items corresponding to the state before it changes : now is the right + * time to do it. + */ + /* For the pid */ + LttvProcessState *process = tfs->process; + g_assert(process != NULL); - guint pid = process->pid; + guint pid = process->pid; - /* Well, the process_out existed : we must get it in the process hash - * or add it, and draw its items. - */ - /* Add process to process list (if not present) */ - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - LttTime birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - - if(processlist_get_process_pixels(process_list, + /* 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[ltt_tracefile_num(tfc->tf)] != NULL)) { + hashed_process_data = process_list->current_hash_data[ltt_tracefile_num(tfc->tf)]; + } else { + hashed_process_data = processlist_get_process_data(process_list, pid, - process->last_cpu, + process->last_cpu_index, &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) + 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; + const gchar *name = g_quark_to_string(process->name); processlist_add(process_list, + drawing, pid, - process->last_cpu, + process->last_cpu_index, process->ppid, &birth, tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( drawing, y, height); - } - - /* Now, the process is in the state hash and our own process hash. - * We definitely can draw the items related to the ending state. - */ - - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); - { - guint x; - DrawContext draw_context; + 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; + } + /* 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.start_time, - end_time, - evtime, - width, - &x); + 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); + +#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); + + + /* 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 = drawing->pixmap; + 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.over; + draw_context.drawinfo.start.x = hashed_process_data->x.middle; draw_context.drawinfo.end.x = x; - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + draw_context.drawinfo.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; @@ -1944,12 +2111,18 @@ int before_execmode_hook(void *hook_data, void *call_data) { /* Draw the line */ - PropertiesLine prop_line = prepare_execmode_line(process); + 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.over = x; + 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); } } @@ -1968,106 +2141,297 @@ int before_execmode_hook(void *hook_data, void *call_data) */ int after_execmode_hook(void *hook_data, void *call_data) { - EventsRequest *events_request = (EventsRequest*)hook_data; + /**************** DOES NOTHING!! *************/ + /* hook desactivated in drawing.c */ + return 0; + + + 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 *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); + /* Add process to process list (if not present) */ + LttvProcessState *process; + LttTime birth; + guint pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + + ProcessList *process_list = control_flow_data->process_list; - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; + /* 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 width = control_flow_data->drawing->width; + guint pid = process->pid; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"syscall_entry") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"syscall_exit") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"trap_entry") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"trap_exit") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"irq_entry") == 0 - ||strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"irq_exit") == 0 - ) { + birth = process->creation_time; - g_debug("execmode!"); - + if(likely(process_list->current_hash_data[ltt_tracefile_num(tfc->tf)] != NULL)) { + hashed_process_data = process_list->current_hash_data[ltt_tracefile_num(tfc->tf)]; + } 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)) { - /* Add process to process list (if not present) */ - LttvProcessState *process; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; + 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); + } + /* Set the current process */ + process_list->current_hash_data[process->last_cpu_index] = + hashed_process_data; + } - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_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); - /* Find process pid_in in the list... */ - process = tfs->process; - /* It should exist, because we are after the state update. */ - g_assert(process != NULL); + if(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; + } + } + return 0; +} - guint pid = process->pid; - birth = process->creation_time; + + +/* before_process_exit_hook + * + * Draw lines for process event. + * + * @param hook_data ControlFlowData structure of the viewer. + * @param call_data Event context. + * + * This function adds items to be drawn in a queue for each process. + * + */ + + +int before_process_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; + + LttEvent *e; + e = ltt_tracefile_get_event(tfc->tf); + + LttTime evtime = ltt_event_time(e); + + /* 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; + + g_assert(process != NULL); + + birth = process->creation_time; + + if(likely(process_list->current_hash_data[ltt_tracefile_num(tfc->tf)] != NULL)) { + hashed_process_data = process_list->current_hash_data[ltt_tracefile_num(tfc->tf)]; + } 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); + } + } + + /* 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); + +#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); + + + /* 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; - if(processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); + /* 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; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data->x.over); + /* 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. * @@ -2077,153 +2441,780 @@ 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; - Drawing_t *drawing = control_flow_data->drawing; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; + guint pid; + { + pid = ltt_event_get_long_unsigned(e, thf->f1); + } - guint width = control_flow_data->drawing->width; + /* 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(tfs, pid); + + if(process != NULL) { + LttTime birth; + guint pl_height = 0; + HashedProcessData *hashed_process_data = NULL; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"process") == 0) { + ProcessList *process_list = control_flow_data->process_list; + + birth = process->creation_time; - guint sub_id; + /* 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->last_cpu_index, + &birth, + tfc->t_context->index); + if(unlikely(hashed_process_data == NULL)) { - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - sub_id = ltt_event_get_long_unsigned(e,element); + 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); } - if(sub_id == 3) { /* exit */ + /* 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); + +#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; - /* Add process to process list (if not present) */ - LttvProcessState *process = tfs->process; - guint pid = process->pid; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - - g_assert(process != NULL); - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); + /* 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; +} + + + + + + + + +#if 0 +/* before_process_hook + * + * Draw lines for process event. + * + * @param hook_data ControlFlowData structure of the viewer. + * @param call_data Event context. + * + * This function adds items to be drawn in a queue for each process. + * + */ +int before_process_hook(void *hook_data, void *call_data) +{ + 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; + + LttEvent *e; + e = ltt_tracefile_get_event(tfc->tf); + + LttTime evtime = ltt_event_time(e); + + guint sub_id; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + sub_id = ltt_event_get_long_unsigned(e,element); + } + + if(sub_id == 3) { /* exit */ + + /* Add process to process list (if not present) */ + LttvProcessState *process = tfs->process; + guint pid = process->pid; + LttTime birth; + guint 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); + } + } + + /* 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); + +#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); + + + /* 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); + } + } + + } else if(sub_id == 7) /* release */ { + + guint pid; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,1); + pid = ltt_event_get_long_unsigned(e,element); + } + + /* 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(tfs, pid); + + if(process != NULL) { + LttTime birth; + guint pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + + ProcessList *process_list = control_flow_data->process_list; + + birth = process->creation_time; + + /* 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->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); + } + + /* 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); + +#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); + + + /* 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; + +} + +#endif //0 + + + +/* after_process_fork_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_fork_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; + + LttEvent *e; + e = ltt_tracefile_get_event(tfc->tf); + + LttTime evtime = ltt_event_time(e); + + guint child_pid; + { + child_pid = ltt_event_get_long_unsigned(e, thf->f2); + } + + /* 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; + + /* Find child in the list... */ + process_child = lttv_state_find_process(tfs, child_pid); + /* It should exist, because we are after the state update. */ + g_assert(process_child != NULL); + + birth = process_child->creation_time; + + /* 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->last_cpu_index, + &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; + 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, + &birth, + tfc->t_context->index, + 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; - if(processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); - } + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; - /* Now, the process is in the state hash and our own process hash. - * We definitely can draw the items related to the ending state. - */ - - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); - { - guint x; - DrawContext draw_context; + LttvTracefileState *tfs = (LttvTracefileState *)call_data; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); + LttEvent *e; + e = ltt_tracefile_get_event(tfc->tf); - /* Now create the drawing context that will be used to draw - * items related to the last state. */ - draw_context.drawable = drawing->pixmap; - draw_context.gc = drawing->gc; - draw_context.pango_layout = drawing->pango_layout; - draw_context.drawinfo.start.x = hashed_process_data->x.middle; - draw_context.drawinfo.end.x = x; + LttTime evtime = ltt_event_time(e); - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + /* 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; - 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; + ProcessList *process_list = control_flow_data->process_list; - { - /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); - draw_line((void*)&prop_line, (void*)&draw_context); + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); - } - /* become the last x position */ - hashed_process_data->x.middle = x; - } + birth = process->creation_time; + if(likely(process_list->current_hash_data[ltt_tracefile_num(tfc->tf)] != NULL) ){ + hashed_process_data = process_list->current_hash_data[ltt_tracefile_num(tfc->tf)]; + } 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); } + /* 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)) + { + 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; + } } - return 0; + return 0; } - - - +#if 0 /* after_process_hook * @@ -2238,177 +3229,207 @@ int before_process_hook(void *hook_data, void *call_data) */ int after_process_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 *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; - e = tfc->e; + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - - guint width = control_flow_data->drawing->width; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"process") == 0) { - - guint sub_id; - guint param1; - { - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - sub_id = ltt_event_get_long_unsigned(e,element); - element = ltt_field_member(f,1); - param1 = ltt_event_get_long_unsigned(e,element); - } + guint sub_id; + guint param1; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + sub_id = ltt_event_get_long_unsigned(e,element); + element = ltt_field_member(f,1); + param1 = ltt_event_get_long_unsigned(e,element); + } - if(sub_id == 2) { /* fork */ - - guint child_pid = param1; - /* Add process to process list (if not present) */ - LttvProcessState *process_child; - LttTime birth; - guint y_child = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data_child = NULL; + 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; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + ProcessList *process_list = control_flow_data->process_list; - /* 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); + /* Find child in the list... */ + process_child = lttv_state_find_process(tfs, child_pid); + /* It should exist, because we are after the state update. */ + g_assert(process_child != NULL); - birth = process_child->creation_time; - const gchar *name = g_quark_to_string(process_child->name); + birth = process_child->creation_time; - if(processlist_get_process_pixels(process_list, - child_pid, - process_child->last_cpu, - &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child) == 1) - { - g_assert(child_pid == 0 || child_pid != process_child->ppid); - /* Process not present */ - processlist_add(process_list, + /* 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->last_cpu, - process_child->ppid, + process_child->last_cpu_index, &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_child); - processlist_get_process_pixels(process_list, - child_pid, - process_child->last_cpu, - &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child); - drawing_insert_square( control_flow_data->drawing, y_child, height); - } + 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; + 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, + &birth, + tfc->t_context->index, + 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.start_time, - end_time, + time_window, evtime, width, &new_x); - hashed_process_data_child->x.over = new_x; - hashed_process_data_child->x.middle = new_x; - hashed_process_data_child->x.under = new_x; - } else if(sub_id == 3) { /* exit */ + 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; + } + } - /* Add process to process list (if not present) */ - LttvProcessState *process = tfs->process; - guint pid = process->pid; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; + } else if(sub_id == 3) { /* exit */ - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + /* 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; - /* It should exist, because we are after the state update. */ - g_assert(process != NULL); + ProcessList *process_list = control_flow_data->process_list; - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); - if(processlist_get_process_pixels(process_list, + birth = process->creation_time; + + if(likely(process_list->current_hash_data[ltt_tracefile_num(tfc->tf)] != NULL) ){ + hashed_process_data = process_list->current_hash_data[ltt_tracefile_num(tfc->tf)]; + } else { + hashed_process_data = processlist_get_process_data(process_list, pid, - process->last_cpu, + process->last_cpu_index, &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) + 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, + process->last_cpu_index, process->ppid, &birth, tfc->t_context->index, name, &pl_height, + &process_info, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); + 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)) + { + 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.start_time, - end_time, + time_window, evtime, width, &new_x); - hashed_process_data->x.middle = 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; + } } - } return 0; } - +#endif //0 gint update_time_window_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; + ProcessList *process_list = control_flow_data->process_list; const TimeWindowNotifyData *time_window_nofify_data = ((const TimeWindowNotifyData *)call_data); @@ -2430,13 +3451,13 @@ gint update_time_window_hook(void *hook_data, void *call_data) * currently shown time interval. (reuse is only for scrolling) */ - g_info("Old time window HOOK : %u, %u to %u, %u", + g_info("Old time window HOOK : %lu, %lu to %lu, %lu", old_time_window->start_time.tv_sec, old_time_window->start_time.tv_nsec, old_time_window->time_width.tv_sec, old_time_window->time_width.tv_nsec); - g_info("New time window HOOK : %u, %u to %u, %u", + g_info("New time window HOOK : %lu, %lu to %lu, %lu", new_time_window->start_time.tv_sec, new_time_window->start_time.tv_nsec, new_time_window->time_width.tv_sec, @@ -2448,11 +3469,11 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Same scale (scrolling) */ g_info("scrolling"); LttTime *ns = &new_time_window->start_time; + LttTime *nw = &new_time_window->time_width; LttTime *os = &old_time_window->start_time; - LttTime old_end = ltt_time_add(old_time_window->start_time, - old_time_window->time_width); - LttTime new_end = ltt_time_add(new_time_window->start_time, - new_time_window->time_width); + LttTime *ow = &old_time_window->time_width; + LttTime old_end = old_time_window->end_time; + LttTime new_end = new_time_window->end_time; //if(nsdrawing->width; convert_time_to_pixels( - *os, - old_end, + *old_time_window, *ns, width, &x); /* Copy old data to new location */ - gdk_draw_drawable (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->black_gc, - control_flow_data->drawing->pixmap, - x, 0, - 0, 0, - control_flow_data->drawing->width-x+SAFETY, -1); - + copy_pixmap_region(process_list, + NULL, + control_flow_data->drawing->drawing_area->style->black_gc, + NULL, + x, 0, + 0, 0, + control_flow_data->drawing->width-x+SAFETY, -1); + if(drawing->damage_begin == drawing->damage_end) drawing->damage_begin = control_flow_data->drawing->width-x; else @@ -2486,22 +3507,20 @@ gint update_time_window_hook(void *hook_data, void *call_data) drawing->damage_end = control_flow_data->drawing->width; /* Clear the data request background, but not SAFETY */ - gdk_draw_rectangle (control_flow_data->drawing->pixmap, - //control_flow_data->drawing->drawing_area->style->black_gc, + rectangle_pixmap(process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, drawing->damage_begin+SAFETY, 0, drawing->damage_end - drawing->damage_begin, // do not overlap - control_flow_data->drawing->height); - - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + -1); + gtk_widget_queue_draw(drawing->drawing_area); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, control_flow_data->drawing->height); @@ -2517,17 +3536,16 @@ gint update_time_window_hook(void *hook_data, void *call_data) guint x = 0; guint width = control_flow_data->drawing->width; convert_time_to_pixels( - *ns, - new_end, + *new_time_window, *os, width, &x); - /* Copy old data to new location */ - gdk_draw_drawable (control_flow_data->drawing->pixmap, + copy_pixmap_region (process_list, + NULL, control_flow_data->drawing->drawing_area->style->black_gc, - control_flow_data->drawing->pixmap, + NULL, 0, 0, x, 0, -1, -1); @@ -2540,22 +3558,22 @@ gint update_time_window_hook(void *hook_data, void *call_data) drawing->damage_begin = 0; - gdk_draw_rectangle (control_flow_data->drawing->pixmap, + rectangle_pixmap (process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, // do not overlap - control_flow_data->drawing->height); + -1); - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end - drawing->damage_begin, control_flow_data->drawing->height); @@ -2569,23 +3587,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Cannot reuse any part of the screen : far jump */ - gdk_draw_rectangle (control_flow_data->drawing->pixmap, + rectangle_pixmap (process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height); + -1); - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); drawing->damage_begin = 0; drawing->damage_end = control_flow_data->drawing->width; drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, 0, 0, control_flow_data->drawing->width, control_flow_data->drawing->height); @@ -2597,23 +3615,23 @@ gint update_time_window_hook(void *hook_data, void *call_data) /* Different scale (zoom) */ g_info("zoom"); - gdk_draw_rectangle (control_flow_data->drawing->pixmap, + rectangle_pixmap (process_list, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height); + -1); - gtk_widget_queue_draw_area (drawing->drawing_area, - 0,0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); + //gtk_widget_queue_draw_area (drawing->drawing_area, + // 0,0, + // control_flow_data->drawing->width, + // control_flow_data->drawing->height); + gtk_widget_queue_draw(drawing->drawing_area); drawing->damage_begin = 0; drawing->damage_end = control_flow_data->drawing->width; drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, 0, 0, control_flow_data->drawing->width, control_flow_data->drawing->height); @@ -2628,32 +3646,16 @@ gint traceset_notify(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; - GtkWidget *widget = drawing->drawing_area; drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); + gtk_widget_set_size_request( + control_flow_data->drawing->drawing_area, + -1, processlist_get_height(control_flow_data->process_list)); redraw_notify(control_flow_data, NULL); request_background_data(control_flow_data); -#if 0 - drawing->damage_begin = 0; - drawing->damage_end = drawing->width; - if(drawing->damage_begin < drawing->damage_end) - { - drawing_data_request(drawing, - &drawing->pixmap, - drawing->damage_begin, - 0, - drawing->damage_end-drawing->damage_begin, - drawing->height); - } - - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); -#endif //0 return FALSE; } @@ -2670,30 +3672,32 @@ gint redraw_notify(void *hook_data, void *call_data) /* fun feature, to be separated someday... */ drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); - - // Clear the image - gdk_draw_rectangle (drawing->pixmap, + gtk_widget_set_size_request( + control_flow_data->drawing->drawing_area, + -1, processlist_get_height(control_flow_data->process_list)); + // Clear the images + rectangle_pixmap (control_flow_data->process_list, widget->style->black_gc, TRUE, 0, 0, - drawing->width+SAFETY, - drawing->height); + drawing->alloc_width, + -1); + gtk_widget_queue_draw(drawing->drawing_area); if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, - &drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end-drawing->damage_begin, drawing->height); } - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); + //gtk_widget_queue_draw_area(drawing->drawing_area, + // 0,0, + // drawing->width, + // drawing->height); return FALSE; } @@ -2703,14 +3707,12 @@ gint continue_notify(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; Drawing_t *drawing = control_flow_data->drawing; - GtkWidget *widget = drawing->drawing_area; //g_assert(widget->allocation.width == drawing->damage_end); if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, - &drawing->pixmap, drawing->damage_begin, 0, drawing->damage_end-drawing->damage_begin, @@ -2733,7 +3735,12 @@ gint update_current_time_hook(void *hook_data, void *call_data) LttTime time_begin = time_window.start_time; LttTime width = time_window.time_width; - LttTime half_width = ltt_time_div(width,2.0); + LttTime half_width; + { + guint64 time_ll = ltt_time_to_uint64(width); + time_ll = time_ll >> 1; /* divide by two */ + half_width = ltt_time_from_uint64(time_ll); + } LttTime time_end = ltt_time_add(time_begin, width); LttvTracesetContext * tsc = @@ -2742,7 +3749,7 @@ gint update_current_time_hook(void *hook_data, void *call_data) LttTime trace_start = tsc->time_span.start_time; LttTime trace_end = tsc->time_span.end_time; - g_info("New current time HOOK : %u, %u", current_time.tv_sec, + g_info("New current time HOOK : %lu, %lu", current_time.tv_sec, current_time.tv_nsec); @@ -2757,41 +3764,42 @@ gint update_current_time_hook(void *hook_data, void *call_data) * at one end of the trace. */ - if(ltt_time_compare(current_time, time_begin) == -1) + if(ltt_time_compare(current_time, time_begin) < 0) { TimeWindow new_time_window; if(ltt_time_compare(current_time, - ltt_time_add(trace_start,half_width)) == -1) + ltt_time_add(trace_start,half_width)) < 0) time_begin = trace_start; else time_begin = ltt_time_sub(current_time,half_width); new_time_window.start_time = time_begin; new_time_window.time_width = width; + new_time_window.time_width_double = ltt_time_to_double(width); + new_time_window.end_time = ltt_time_add(time_begin, width); lttvwindow_report_time_window(control_flow_data->tab, new_time_window); } - else if(ltt_time_compare(current_time, time_end) == 1) + else if(ltt_time_compare(current_time, time_end) > 0) { TimeWindow new_time_window; - if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) == 1) + if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) > 0) time_begin = ltt_time_sub(trace_end,width); else time_begin = ltt_time_sub(current_time,half_width); new_time_window.start_time = time_begin; new_time_window.time_width = width; + new_time_window.time_width_double = ltt_time_to_double(width); + new_time_window.end_time = ltt_time_add(time_begin, width); lttvwindow_report_time_window(control_flow_data->tab, new_time_window); } - //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); - gtk_widget_queue_draw_area(drawing->drawing_area, - 0,0, - drawing->width, - drawing->height); + gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); + return 0; } @@ -2800,6 +3808,7 @@ typedef struct _ClosureData { EventsRequest *events_request; LttvTracesetState *tss; LttTime end_time; + guint x_end; } ClosureData; @@ -2811,23 +3820,11 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) EventsRequest *events_request = closure_data->events_request; ControlFlowData *control_flow_data = events_request->viewer_data; - Drawing_t *drawing = control_flow_data->drawing; LttvTracesetState *tss = closure_data->tss; - LttvTracesetContext *tsc = (LttvTracesetContext*)closure_data->tss; + LttvTracesetContext *tsc = (LttvTracesetContext*)tss; LttTime evtime = closure_data->end_time; - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - - LttTime end_time = ltt_time_add(time_window.start_time, - time_window.time_width); - - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, end_time) == 1) - return; - - guint width = drawing->width; { /* For the process */ @@ -2836,73 +3833,77 @@ void draw_closure(gpointer key, gpointer value, gpointer user_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. */ +#ifdef EXTRA_CHECK g_assert(lttv_traceset_number(tsc->ts) > 0); - - /* 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]; - +#endif //EXTRA_CHECK + LttvTraceContext *tc = tsc->traces[process_info->trace_num]; + + //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); + + // LttvTracefileState *tfs = + // (LttvTracefileState*)tsc->traces[process_info->trace_num]-> + // tracefiles[process_info->cpu]; + LttvProcessState *process; process = lttv_state_find_process(tfs, process_info->pid); - if(process != NULL) { + if(unlikely(process != NULL)) { /* Only draw for processes that are currently in the trace states */ - guint y = 0, height = 0, pl_height = 0; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - LttTime birth = process_info->birth; - + ProcessList *process_list = control_flow_data->process_list; +#ifdef EXTRA_CHECK /* Should be alike when background info is ready */ if(control_flow_data->background_info_waiting==0) g_assert(ltt_time_compare(process->creation_time, process_info->birth) == 0); - const gchar *name = g_quark_to_string(process->name); - - /* process HAS to be present */ - g_assert(processlist_get_process_pixels(process_list, - process_info->pid, - process_info->cpu, - &birth, - process_info->trace_num, - &y, - &height, - &hashed_process_data) != 1); +#endif //EXTRA_CHECK /* Now, the process is in the state hash and our own process hash. * We definitely can draw the items related to the ending state. */ - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); + if(unlikely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) <= 0)) { - guint x; - DrawContext draw_context; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); +#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 = closure_data->x_end; + + DrawContext draw_context; /* Now create the drawing context that will be used to draw * items related to the last state. */ - draw_context.drawable = drawing->pixmap; + draw_context.drawable = hashed_process_data->pixmap; draw_context.gc = drawing->gc; draw_context.pango_layout = drawing->pango_layout; draw_context.drawinfo.end.x = x; - draw_context.drawinfo.y.over = y+1; - draw_context.drawinfo.y.middle = y+(height/2); - draw_context.drawinfo.y.under = y+height; + draw_context.drawinfo.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; @@ -2910,25 +3911,52 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) draw_context.drawinfo.end.offset.over = 0; draw_context.drawinfo.end.offset.middle = 0; draw_context.drawinfo.end.offset.under = 0; - +#if 0 + /* Jump over draw if we are at the same x position */ + if(x == hashed_process_data->x.over) { + /* jump */ + } else { draw_context.drawinfo.start.x = hashed_process_data->x.over; /* Draw the line */ PropertiesLine prop_line = prepare_execmode_line(process); draw_line((void*)&prop_line, (void*)&draw_context); + hashed_process_data->x.over = x; } - hashed_process_data->x.over = x; - { +#endif //0 + + if(unlikely(x == hashed_process_data->x.middle && + hashed_process_data->x.middle_used)) { +#if 0 /* do not mark closure : not missing information */ + if(hashed_process_data->x.middle_marked == FALSE) { + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } +#endif //0 + /* Jump */ + } else { draw_context.drawinfo.start.x = hashed_process_data->x.middle; /* Draw the line */ - PropertiesLine prop_line = prepare_status_line(process); + PropertiesLine prop_line = prepare_s_e_line(process); draw_line((void*)&prop_line, (void*)&draw_context); - } + /* become the last x position */ + if(likely(x != hashed_process_data->x.middle)) { + hashed_process_data->x.middle = x; + /* but don't use the pixel */ + hashed_process_data->x.middle_used = FALSE; - /* become the last x position */ - hashed_process_data->x.middle = x; + /* Calculate the next good time */ + convert_pixels_to_time(width, x+1, time_window, + &hashed_process_data->next_good_time); + } + } } } } @@ -2938,8 +3966,15 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) int before_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - + LttvTracesetState *tss = (LttvTracesetState*)call_data; + ControlFlowData *cfd = (ControlFlowData*)events_request->viewer_data; +#if 0 + /* Desactivate sort */ + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(cfd->process_list->list_store), + TRACE_COLUMN, + GTK_SORT_ASCENDING); +#endif //0 drawing_chunk_begin(events_request, tss); return 0; @@ -2948,8 +3983,8 @@ int before_chunk(void *hook_data, void *call_data) int before_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - + LttvTracesetState *tss = (LttvTracesetState*)call_data; + drawing_data_request_begin(events_request, tss); return 0; @@ -2969,11 +4004,9 @@ int after_request(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; LttTime end_time = events_request->end_time; ClosureData closure_data; @@ -2981,9 +4014,20 @@ int after_request(void *hook_data, void *call_data) closure_data.tss = tss; closure_data.end_time = end_time; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + guint width = control_flow_data->drawing->width; + convert_time_to_pixels( + time_window, + end_time, + width, + &closure_data.x_end); + + /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); + /* Request expose */ drawing_request_expose(events_request, tss, end_time); @@ -2999,14 +4043,16 @@ int after_chunk(void *hook_data, void *call_data) { EventsRequest *events_request = (EventsRequest*)hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; - LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); - LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracesetState *tss = (LttvTracesetState*)call_data; + LttvTracesetContext *tsc = (LttvTracesetContext*)call_data; LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc); LttTime end_time; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); + ProcessList *process_list = control_flow_data->process_list; + g_free(process_list->current_hash_data); + process_list->current_hash_data = NULL; + if(tfc != NULL) end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time); else /* end of traceset, or position now out of request : end */ @@ -3017,11 +4063,30 @@ int after_chunk(void *hook_data, void *call_data) closure_data.tss = tss; closure_data.end_time = end_time; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + guint width = control_flow_data->drawing->width; + convert_time_to_pixels( + time_window, + end_time, + width, + &closure_data.x_end); + /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); - - /* Request expose */ +#if 0 + /* Reactivate sort */ + gtk_tree_sortable_set_sort_column_id( + GTK_TREE_SORTABLE(control_flow_data->process_list->list_store), + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, + GTK_SORT_ASCENDING); + + update_index_to_pixmap(control_flow_data->process_list); + /* Request a full expose : drawing scrambled */ + gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); +#endif //0 + /* Request expose (updates damages zone also) */ drawing_request_expose(events_request, tss, end_time); return 0;