X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=d3c454d2579274cbb7a81d409b1eb7d5fcf21cb3;hb=5c230fc4452672cb8c62b2b350c8f8e1d7d579d9;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..d3c454d2 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -97,8 +97,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; @@ -206,7 +205,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); @@ -265,7 +270,54 @@ int event_selected_hook(void *hook_data, void *call_data) } +/* 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(); + + g_debug("prepare_status_line for state : %s", + g_quark_to_string(process->state->s)); + + 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; + +} +#if 0 static __inline PropertiesLine prepare_status_line(LttvProcessState *process) { PropertiesLine prop_line; @@ -303,7 +355,7 @@ static __inline PropertiesLine prepare_status_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_schedchange_hook @@ -348,102 +400,114 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); - } + guint pid_out; + guint pid_in; + { + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + pid_out = ltt_event_get_long_unsigned(e,element); + element = ltt_field_member(f,1); + pid_in = ltt_event_get_long_unsigned(e,element); + g_debug("out : %u in : %u", pid_out, pid_in); + } + + { + /* For the pid_out */ + /* First, check if the current process is in the state computation + * process list. If it is there, that means we must add it right now and + * draw items from the beginning of the read for it. If it is not + * present, it's a new process and it was not present : it will + * be added after the state update. */ + LttvProcessState *process; + process = lttv_state_find_process(tfs, pid_out); - { - /* For the pid_out */ - /* First, check if the current process is in the state computation - * process list. If it is there, that means we must add it right now and - * draw items from the beginning of the read for it. If it is not - * present, it's a new process and it was not present : it will - * be added after the state update. */ - LttvProcessState *process; - process = lttv_state_find_process(tfs, pid_out); + 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 = control_flow_data->process_list; + LttTime birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); - 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, + 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, + pid_out, + process->last_cpu, + process->ppid, + &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) == 1) - { - g_assert(pid_out == 0 || pid_out != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid_out, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &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); - } + &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. + */ - /* 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); + /* 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; + convert_time_to_pixels( + time_window.start_time, + end_time, + 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) { - guint x; + 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; + } + /* jump */ + } else { DrawContext draw_context; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); - /* Now create the drawing context that will be used to draw * items related to the last state. */ draw_context.drawable = drawing->pixmap; @@ -465,90 +529,109 @@ 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; } } } + } - { - /* 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 y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = control_flow_data->process_list; + LttTime birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); - 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, + if(processlist_get_process_pixels(process_list, + pid_in, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid_in == 0 || pid_in != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid_in, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, pid_in, process->last_cpu, &birth, tfc->t_context->index, &y, &height, - &hashed_process_data) == 1) - { - g_assert(pid_in == 0 || pid_in != process->ppid); - /* Process not present */ - processlist_add(process_list, - pid_in, - process->last_cpu, - process->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid_in, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( drawing, y, height); - } + &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. + */ - /* 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); + /* 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; + + convert_time_to_pixels( + time_window.start_time, + end_time, + 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) { - guint x; + 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; + } + /* jump */ + } else { DrawContext draw_context; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); - /* Now create the drawing context that will be used to draw * items related to the last state. */ draw_context.drawable = drawing->pixmap; @@ -570,13 +653,15 @@ 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; } } } @@ -620,8 +705,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); @@ -1233,84 +1317,87 @@ int after_schedchange_hook(void *hook_data, void *call_data) guint width = control_flow_data->drawing->width; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { + /* Add process to process list (if not present) */ + LttvProcessState *process_out, *process_in; + LttTime birth; + guint y_in = 0, y_out = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data_in = NULL; - g_debug("schedchange!"); - - { - /* Add process to process list (if not present) */ - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data_in = NULL; - - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - - guint pid_in; - { - guint pid_out; - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - pid_out = ltt_event_get_long_unsigned(e,element); - element = ltt_field_member(f,1); - pid_in = ltt_event_get_long_unsigned(e,element); - g_debug("out : %u in : %u", pid_out, pid_in); - } + ProcessList *process_list = control_flow_data->process_list; + + guint pid_in; + { + guint pid_out; + LttField *f = ltt_event_field(e); + LttField *element; + element = ltt_field_member(f,0); + pid_out = ltt_event_get_long_unsigned(e,element); + element = ltt_field_member(f,1); + pid_in = ltt_event_get_long_unsigned(e,element); + g_debug("out : %u in : %u", pid_out, pid_in); + } - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - /* It should exist, because we are after the state update. */ - g_assert(process_in != NULL); + /* Find process pid_in in the list... */ + process_in = lttv_state_find_process(tfs, pid_in); + /* It should exist, because we are after the state update. */ + g_assert(process_in != NULL); - birth = process_in->creation_time; - const gchar *name = g_quark_to_string(process_in->name); + birth = process_in->creation_time; + const gchar *name = g_quark_to_string(process_in->name); - if(processlist_get_process_pixels(process_list, - pid_in, - 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, + 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, - process_in->ppid, &birth, tfc->t_context->index, - name, - &pl_height, + &y_in, + &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); - } + drawing_insert_square( control_flow_data->drawing, y_in, height); + } - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data_in->x.middle); - } + guint new_x; + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &new_x); + + 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; @@ -1347,8 +1434,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); @@ -1764,6 +1850,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) #endif //0 } +#if 0 static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) { PropertiesLine prop_line; @@ -1794,7 +1881,7 @@ static __inline PropertiesLine prepare_execmode_line(LttvProcessState *process) return prop_line; } - +#endif //0 /* before_execmode_hook @@ -1842,93 +1929,101 @@ int before_execmode_hook(void *hook_data, void *call_data) 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, - 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, + /* 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 = control_flow_data->process_list; + LttTime birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, pid, process->last_cpu, - process->ppid, &birth, tfc->t_context->index, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( drawing, y, height); - } + &y, + &height, + &hashed_process_data) == 1) + { + g_assert(pid == 0 || pid != process->ppid); + /* Process not present */ + processlist_add(process_list, + pid, + process->last_cpu, + process->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid, + process->last_cpu, + &birth, + tfc->t_context->index, + &y, + &height, + &hashed_process_data); + drawing_insert_square( drawing, y, height); + } + + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ - /* 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; + /* 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; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); + convert_time_to_pixels( + time_window.start_time, + end_time, + 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(drawing->pixmap, + drawing->gc, + x, + y+(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.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; @@ -1944,12 +2039,14 @@ 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; } } @@ -1992,76 +2089,70 @@ int after_execmode_hook(void *hook_data, void *call_data) guint width = control_flow_data->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 - ) { - - g_debug("execmode!"); - - { - /* 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; + /* Add process to process list (if not present) */ + LttvProcessState *process; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + ProcessList *process_list = control_flow_data->process_list; - /* Find process pid_in in the list... */ - process = tfs->process; - /* It should exist, because we are after the state update. */ - g_assert(process != NULL); + /* Find process pid_in in the list... */ + process = tfs->process; + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); - guint pid = process->pid; + guint pid = process->pid; - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); + birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); - if(processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data) == 1) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - processlist_add(process_list, + 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, - process->ppid, &birth, tfc->t_context->index, - name, - &pl_height, + &y, + &height, &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - process->last_cpu, - &birth, - tfc->t_context->index, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); - } - - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &hashed_process_data->x.over); - } + drawing_insert_square( control_flow_data->drawing, y, height); } + + guint new_x; + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &new_x); + + 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; } @@ -2104,84 +2195,98 @@ int before_process_hook(void *hook_data, void *call_data) guint width = control_flow_data->drawing->width; - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"process") == 0) { - - 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); - } + 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 */ + if(sub_id == 3) { /* exit */ - /* Add process to process list (if not present) */ - LttvProcessState *process = tfs->process; - guint pid = process->pid; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; + /* Add process to process list (if not present) */ + LttvProcessState *process = tfs->process; + guint pid = process->pid; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - - g_assert(process != NULL); + ProcessList *process_list = control_flow_data->process_list; + + g_assert(process != NULL); - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); + birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); - if(processlist_get_process_pixels(process_list, + 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) == 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); - } + &hashed_process_data); + drawing_insert_square( control_flow_data->drawing, y, height); + } - /* Now, the process is in the state hash and our own process hash. - * We definitely can draw the items related to the ending state. - */ - - /* Check if the x position is unset. In can have been left unset by - * a draw closure from a after chunk hook. This should never happen, - * because it must be set by before chunk hook to the damage_begin - * value. - */ - g_assert(hashed_process_data->x.over != -1); - { - guint x; - DrawContext draw_context; + /* 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; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &x); + convert_time_to_pixels( + time_window.start_time, + end_time, + 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(drawing->pixmap, + drawing->gc, + x, + y+(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. */ @@ -2204,17 +2309,17 @@ int before_process_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; } - } - } return 0; @@ -2262,140 +2367,150 @@ int after_process_hook(void *hook_data, void *call_data) 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 y_child = 0, height = 0, 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; + const gchar *name = g_quark_to_string(process_child->name); - if(processlist_get_process_pixels(process_list, + if(processlist_get_process_pixels(process_list, + child_pid, + process_child->last_cpu, + &birth, + tfc->t_context->index, + &y_child, + &height, + &hashed_process_data_child) == 1) + { + g_assert(child_pid == 0 || child_pid != process_child->ppid); + /* Process not present */ + processlist_add(process_list, + child_pid, + process_child->last_cpu, + process_child->ppid, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data_child); + processlist_get_process_pixels(process_list, child_pid, process_child->last_cpu, &birth, tfc->t_context->index, &y_child, &height, - &hashed_process_data_child) == 1) - { - g_assert(child_pid == 0 || child_pid != process_child->ppid); - /* Process not present */ - processlist_add(process_list, - child_pid, - process_child->last_cpu, - process_child->ppid, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_child); - processlist_get_process_pixels(process_list, - child_pid, - process_child->last_cpu, - &birth, - tfc->t_context->index, - &y_child, - &height, - &hashed_process_data_child); - drawing_insert_square( control_flow_data->drawing, y_child, height); - } + &hashed_process_data_child); + drawing_insert_square( control_flow_data->drawing, y_child, height); + } - guint new_x; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &new_x); + guint new_x; + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &new_x); + + if(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(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(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; + } - } else if(sub_id == 3) { /* exit */ + } else if(sub_id == 3) { /* exit */ - /* Add process to process list (if not present) */ - LttvProcessState *process = tfs->process; - guint pid = process->pid; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - HashedProcessData *hashed_process_data = NULL; + /* Add process to process list (if not present) */ + LttvProcessState *process = tfs->process; + guint pid = process->pid; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; - ProcessList *process_list = - guicontrolflow_get_process_list(control_flow_data); - + ProcessList *process_list = control_flow_data->process_list; - /* It should exist, because we are after the state update. */ - g_assert(process != NULL); + /* It should exist, because we are after the state update. */ + g_assert(process != NULL); - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); + birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); - if(processlist_get_process_pixels(process_list, + 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) == 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); - } + &hashed_process_data); + drawing_insert_square( control_flow_data->drawing, y, height); + } - guint new_x; - convert_time_to_pixels( - time_window.start_time, - end_time, - evtime, - width, - &new_x); + guint new_x; + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &new_x); + 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; } @@ -2733,7 +2848,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 = @@ -2852,8 +2972,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) /* 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); + ProcessList *process_list = control_flow_data->process_list; LttTime birth = process_info->birth; /* Should be alike when background info is ready */ @@ -2884,7 +3003,6 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) g_assert(hashed_process_data->x.over != -1); { guint x; - DrawContext draw_context; convert_time_to_pixels( time_window.start_time, @@ -2893,6 +3011,8 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) width, &x); + 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; @@ -2910,25 +3030,46 @@ 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(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(drawing->pixmap, + drawing->gc, + x, + y+(height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + /* 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(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; } } } @@ -2972,8 +3113,7 @@ int after_request(void *hook_data, void *call_data) LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(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; @@ -3004,8 +3144,7 @@ int after_chunk(void *hook_data, void *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; if(tfc != NULL) end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);