From 4a24fa1f30c23e86e928d2bdb6835da895cb3681 Mon Sep 17 00:00:00 2001 From: compudj Date: Sun, 28 Aug 2005 19:35:10 +0000 Subject: [PATCH] after memleak fix : control flow view git-svn-id: http://ltt.polymtl.ca/svn@1089 04897980-b3bd-0310-b5e0-8ef037075253 --- .../lttv/modules/gui/controlflow/drawing.c | 2 +- .../lttv/modules/gui/controlflow/eventhooks.c | 2107 +---------------- 2 files changed, 128 insertions(+), 1981 deletions(-) diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c index 0def3154..ef556d75 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/drawing.c @@ -412,7 +412,7 @@ void drawing_data_request(Drawing_t *drawing, LTTV_PRIO_STATE+5); } } - + events_request->hooks = hooks; // Fill the events request diff --git a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c index a31234c6..089cd5e9 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -82,61 +82,6 @@ extern GSList *g_legend_list; -#if 0 -typedef struct _ProcessAddClosure { - ControlFlowData *cfd; - guint trace_num; -} ProcessAddClosure; - -static void process_add(gpointer key, - gpointer value, - gpointer user_data) -{ - LttvProcessState *process = (LttvProcessState*)value; - ProcessAddClosure *closure = (ProcessAddClosure*)user_data; - ControlFlowData *control_flow_data = closure->cfd; - guint trace_num = closure->trace_num; - - /* Add process to process list (if not present) */ - guint pid; - LttTime birth; - guint y = 0, height = 0, pl_height = 0; - - ProcessList *process_list = control_flow_data->process_list; - - pid = process->pid; - birth = process->creation_time; - const gchar *name = g_quark_to_string(process->name); - HashedProcessData *hashed_process_data = NULL; - - if(processlist_get_process_pixels(process_list, - pid, - &birth, - trace_num, - &y, - &height, - &hashed_process_data) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid, - &birth, - trace_num, - name, - &pl_height, - &hashed_process_data); - processlist_get_process_pixels(process_list, - pid, - &birth, - trace_num, - &y, - &height, - &hashed_process_data); - drawing_insert_square( control_flow_data->drawing, y, height); - } -} -#endif //0 - /* Action to do when background computation completed. * @@ -151,7 +96,7 @@ gint background_ready(void *hook_data, void *call_data) control_flow_data->background_info_waiting--; if(control_flow_data->background_info_waiting == 0) { - g_debug("control flow viewer : background computation data ready."); + g_message("control flow viewer : background computation data ready."); drawing_clear(control_flow_data->drawing); processlist_clear(control_flow_data->process_list); @@ -360,46 +305,6 @@ static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) } -#if 0 -static inline PropertiesLine prepare_status_line(LttvProcessState *process) -{ - PropertiesLine prop_line; - prop_line.line_width = 2; - prop_line.style = GDK_LINE_SOLID; - prop_line.y = MIDDLE; - //GdkColormap *colormap = gdk_colormap_get_system(); - - g_debug("prepare_status_line for state : %s", - g_quark_to_string(process->state->s)); - - /* color of line : status of the process */ - if(process->state->s == LTTV_STATE_UNNAMED) - prop_line.color = drawing_colors[COL_WHITE]; - else if(process->state->s == LTTV_STATE_WAIT_FORK) - prop_line.color = drawing_colors[COL_WAIT_FORK]; - else if(process->state->s == LTTV_STATE_WAIT_CPU) - prop_line.color = drawing_colors[COL_WAIT_CPU]; - else if(process->state->s == LTTV_STATE_EXIT) - prop_line.color = drawing_colors[COL_EXIT]; - else if(process->state->s == LTTV_STATE_ZOMBIE) - prop_line.color = drawing_colors[COL_ZOMBIE]; - else if(process->state->s == LTTV_STATE_WAIT) - prop_line.color = drawing_colors[COL_WAIT]; - else if(process->state->s == LTTV_STATE_RUN) - prop_line.color = drawing_colors[COL_RUN]; - else - prop_line.color = drawing_colors[COL_WHITE]; - - //gdk_colormap_alloc_color(colormap, - // prop_line.color, - // FALSE, - // TRUE); - - return prop_line; - -} -#endif //0 - /* before_schedchange_hook * @@ -768,590 +673,6 @@ int before_schedchange_hook(void *hook_data, void *call_data) return 0; -#if 0 - EventsRequest *events_request = (EventsRequest*)hook_data; - ControlFlowData *control_flow_data = - (ControlFlowData*)events_request->viewer_data; - Tab *tab = control_flow_data->tab; - - LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; - - LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; - - LttEvent *e; - e = tfc->e; - - LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(tab); - - LttTime time_window.end_time = time_window.time_window.end_time; - - //if(time < time_beg || time > time_end) return; - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, time_window.end_time) == 1) - return; - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) - { - g_debug("schedchange!"); - - /* Add process to process list (if not present) and get drawing "y" from - * process position */ - guint pid_out, pid_in; - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - - ProcessList *process_list = control_flow_data->process_list; - - - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - pid_out = ltt_event_get_long_unsigned(e,element); - element = ltt_field_member(f,1); - pid_in = ltt_event_get_long_unsigned(e,element); - g_debug("out : %u in : %u", pid_out, pid_in); - - - /* Find process pid_out in the list... */ - process_out = lttv_state_find_process(tfs, pid_out); - if(process_out == NULL) return 0; - g_debug("out : %s",g_quark_to_string(process_out->state->s)); - - birth = process_out->creation_time; - const gchar *name = g_quark_to_string(process_out->name); - HashedProcessData *hashed_process_data_out = NULL; - - if(processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid_out, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_out); - g_assert(processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out)==0); - drawing_insert_square( control_flow_data->drawing, y_out, height); - } - //g_free(name); - - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - if(process_in == NULL) return 0; - g_debug("in : %s",g_quark_to_string(process_in->state->s)); - - birth = process_in->creation_time; - name = g_quark_to_string(process_in->name); - HashedProcessData *hashed_process_data_in = NULL; - - if(processlist_get_process_pixels(process_list, - pid_in, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid_in, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_in); - processlist_get_process_pixels(process_list, - pid_in, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in); - - drawing_insert_square( control_flow_data->drawing, y_in, height); - } - //g_free(name); - - - /* Find pixels corresponding to time of the event. If the time does - * not fit in the window, show a warning, not supposed to happend. */ - guint x = 0; - guint width = control_flow_data->drawing->width; - - LttTime time = ltt_event_time(e); - - LttTime window_end = time_window.time_window.end_time; - - convert_time_to_pixels( - time_window, - time, - width, - &x); - //assert(x <= width); - // - /* draw what represents the event for outgoing process. */ - - DrawContext *draw_context_out = hashed_process_data_out->draw_context; - draw_context_out->current->modify_over->x = x; - draw_context_out->current->modify_under->x = x; - draw_context_out->current->modify_over->y = y_out; - draw_context_out->current->modify_under->y = y_out+(height/2)+2; - draw_context_out->drawable = control_flow_data->drawing->pixmap; - draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; - GtkWidget *widget = control_flow_data->drawing->drawing_area; - //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); - //draw_context_out->gc = widget->style->black_gc; - - //draw_arc((void*)&prop_arc, (void*)draw_context_out); - //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); - - /* Draw the line/background of the out process */ - if(draw_context_out->previous->middle->x == -1) - { - draw_context_out->previous->over->x = - control_flow_data->drawing->damage_begin; - draw_context_out->previous->middle->x = - control_flow_data->drawing->damage_begin; - draw_context_out->previous->under->x = - control_flow_data->drawing->damage_begin; - g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_begin); - } - - draw_context_out->current->middle->x = x; - draw_context_out->current->over->x = x; - draw_context_out->current->under->x = x; - draw_context_out->current->middle->y = y_out + height/2; - draw_context_out->current->over->y = y_out; - draw_context_out->current->under->y = y_out + height; - draw_context_out->previous->middle->y = y_out + height/2; - draw_context_out->previous->over->y = y_out; - draw_context_out->previous->under->y = y_out + height; - - draw_context_out->drawable = control_flow_data->drawing->pixmap; - draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; - - if(process_out->state->s == LTTV_STATE_RUN) - { - //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); - draw_context_out->gc = control_flow_data->drawing->gc; - - PropertiesBG prop_bg; - prop_bg.color = g_new(GdkColor,1); - - switch(ltt_tracefile_num(tfc->tf)) { - case 0: - prop_bg.color->red = 0x1515; - prop_bg.color->green = 0x1515; - prop_bg.color->blue = 0x8c8c; - break; - case 1: - prop_bg.color->red = 0x4e4e; - prop_bg.color->green = 0xa9a9; - prop_bg.color->blue = 0xa4a4; - break; - case 2: - prop_bg.color->red = 0x7a7a; - prop_bg.color->green = 0x4a4a; - prop_bg.color->blue = 0x8b8b; - break; - case 3: - prop_bg.color->red = 0x8080; - prop_bg.color->green = 0x7777; - prop_bg.color->blue = 0x4747; - break; - default: - prop_bg.color->red = 0xe7e7; - prop_bg.color->green = 0xe7e7; - prop_bg.color->blue = 0xe7e7; - } - - g_debug("calling from draw_event"); - draw_bg((void*)&prop_bg, (void*)draw_context_out); - g_free(prop_bg.color); - //gdk_gc_unref(draw_context_out->gc); - } - - draw_context_out->gc = widget->style->black_gc; - - GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; - GdkColor colorbg_out = { 0, 0x0000, 0x0000, 0x0000 }; - PropertiesText prop_text_out; - prop_text_out.foreground = &colorfg_out; - prop_text_out.background = &colorbg_out; - prop_text_out.size = 6; - prop_text_out.position = OVER; - - /* color of text : status of the process */ - if(process_out->state->s == LTTV_STATE_UNNAMED) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - { - prop_text_out.foreground->red = 0x0fff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0xfff0; - } - else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_ZOMBIE) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0x0000; - prop_text_out.foreground->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0x0000; - prop_text_out.foreground->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_RUN) - { - prop_text_out.foreground->red = 0x0000; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0x0000; - } - else - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0xffff; - } - - - /* Print status of the process : U, WF, WC, E, W, R */ - if(process_out->state->s == LTTV_STATE_UNNAMED) - prop_text_out.text = "U->"; - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - prop_text_out.text = "WF->"; - else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - prop_text_out.text = "WC->"; - else if(process_out->state->s == LTTV_STATE_ZOMBIE) - prop_text_out.text = "E->"; - else if(process_out->state->s == LTTV_STATE_WAIT) - prop_text_out.text = "W->"; - else if(process_out->state->s == LTTV_STATE_RUN) - prop_text_out.text = "R->"; - else - prop_text_out.text = "U"; - - draw_text((void*)&prop_text_out, (void*)draw_context_out); - //gdk_gc_unref(draw_context_out->gc); - - //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); - draw_context_out->gc = control_flow_data->drawing->gc; - - PropertiesLine prop_line_out; - prop_line_out.color = g_new(GdkColor,1); - prop_line_out.line_width = 2; - prop_line_out.style = GDK_LINE_SOLID; - prop_line_out.position = MIDDLE; - - g_debug("out state : %s", g_quark_to_string(process_out->state->s)); - - /* color of line : status of the process */ - if(process_out->state->s == LTTV_STATE_UNNAMED) - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0xffff; - prop_line_out.color->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - { - prop_line_out.color->red = 0x0fff; - prop_line_out.color->green = 0xffff; - prop_line_out.color->blue = 0xfff0; - } - else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0xffff; - prop_line_out.color->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_ZOMBIE) - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT) - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0x0000; - prop_line_out.color->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_RUN) - { - prop_line_out.color->red = 0x0000; - prop_line_out.color->green = 0xffff; - prop_line_out.color->blue = 0x0000; - } - else - { - prop_line_out.color->red = 0xffff; - prop_line_out.color->green = 0xffff; - prop_line_out.color->blue = 0xffff; - } - - draw_line((void*)&prop_line_out, (void*)draw_context_out); - g_free(prop_line_out.color); - //gdk_gc_unref(draw_context_out->gc); - /* Note : finishing line will have to be added when trace read over. */ - - /* Finally, update the drawing context of the pid_in. */ - - DrawContext *draw_context_in = hashed_process_data_in->draw_context; - draw_context_in->current->modify_over->x = x; - draw_context_in->current->modify_under->x = x; - draw_context_in->current->modify_over->y = y_in; - draw_context_in->current->modify_under->y = y_in+(height/2)+2; - draw_context_in->drawable = control_flow_data->drawing->pixmap; - draw_context_in->pango_layout = control_flow_data->drawing->pango_layout; - widget = control_flow_data->drawing->drawing_area; - //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - //draw_context_in->gc = widget->style->black_gc; - //draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); - - //draw_arc((void*)&prop_arc, (void*)draw_context_in); - //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); - - /* Draw the line/bg of the in process */ - if(draw_context_in->previous->middle->x == -1) - { - draw_context_in->previous->over->x = - control_flow_data->drawing->damage_begin; - draw_context_in->previous->middle->x = - control_flow_data->drawing->damage_begin; - draw_context_in->previous->under->x = - control_flow_data->drawing->damage_begin; - - g_debug("in middle x_beg : %u",control_flow_data->drawing->damage_begin); - - } - - draw_context_in->current->middle->x = x; - draw_context_in->current->over->x = x; - draw_context_in->current->under->x = x; - draw_context_in->current->middle->y = y_in + height/2; - draw_context_in->current->over->y = y_in; - draw_context_in->current->under->y = y_in + height; - draw_context_in->previous->middle->y = y_in + height/2; - draw_context_in->previous->over->y = y_in; - draw_context_in->previous->under->y = y_in + height; - - draw_context_in->drawable = control_flow_data->drawing->pixmap; - draw_context_in->pango_layout = control_flow_data->drawing->pango_layout; - - - if(process_in->state->s == LTTV_STATE_RUN) - { - //draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); - draw_context_in->gc = control_flow_data->drawing->gc; - - PropertiesBG prop_bg; - prop_bg.color = g_new(GdkColor,1); - - switcht(ltt_tracefile_num(tfc->tf)) { - case 0: - prop_bg.color->red = 0x1515; - prop_bg.color->green = 0x1515; - prop_bg.color->blue = 0x8c8c; - break; - case 1: - prop_bg.color->red = 0x4e4e; - prop_bg.color->green = 0xa9a9; - prop_bg.color->blue = 0xa4a4; - break; - case 2: - prop_bg.color->red = 0x7a7a; - prop_bg.color->green = 0x4a4a; - prop_bg.color->blue = 0x8b8b; - break; - case 3: - prop_bg.color->red = 0x8080; - prop_bg.color->green = 0x7777; - prop_bg.color->blue = 0x4747; - break; - default: - prop_bg.color->red = 0xe7e7; - prop_bg.color->green = 0xe7e7; - prop_bg.color->blue = 0xe7e7; - } - - - draw_bg((void*)&prop_bg, (void*)draw_context_in); - g_free(prop_bg.color); - //gdk_gc_unref(draw_context_in->gc); - } - - draw_context_in->gc = widget->style->black_gc; - - GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; - GdkColor colorbg_in = { 0, 0x0000, 0x0000, 0x0000 }; - PropertiesText prop_text_in; - prop_text_in.foreground = &colorfg_in; - prop_text_in.background = &colorbg_in; - prop_text_in.size = 6; - prop_text_in.position = OVER; - - g_debug("in state : %s", g_quark_to_string(process_in->state->s)); - /* foreground of text : status of the process */ - if(process_in->state->s == LTTV_STATE_UNNAMED) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - { - prop_text_in.foreground->red = 0x0fff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xfff0; - } - else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_ZOMBIE) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0x0000; - prop_text_in.foreground->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0x0000; - prop_text_in.foreground->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_RUN) - { - prop_text_in.foreground->red = 0x0000; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0x0000; - } - else - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xffff; - } - - - - /* Print status of the process : U, WF, WC, E, W, R */ - if(process_in->state->s == LTTV_STATE_UNNAMED) - prop_text_in.text = "U->"; - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - prop_text_in.text = "WF->"; - else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - prop_text_in.text = "WC->"; - else if(process_in->state->s == LTTV_STATE_ZOMBIE) - prop_text_in.text = "E->"; - else if(process_in->state->s == LTTV_STATE_WAIT) - prop_text_in.text = "W->"; - else if(process_in->state->s == LTTV_STATE_RUN) - prop_text_in.text = "R->"; - else - prop_text_in.text = "U"; - - draw_text((void*)&prop_text_in, (void*)draw_context_in); - //gdk_gc_unref(draw_context_in->gc); - - //draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - //gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); - draw_context_in->gc = control_flow_data->drawing->gc; - - PropertiesLine prop_line_in; - prop_line_in.color = g_new(GdkColor,1); - prop_line_in.line_width = 2; - prop_line_in.style = GDK_LINE_SOLID; - prop_line_in.position = MIDDLE; - - /* color of line : status of the process */ - if(process_in->state->s == LTTV_STATE_UNNAMED) - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0xffff; - prop_line_in.color->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - { - prop_line_in.color->red = 0x0fff; - prop_line_in.color->green = 0xffff; - prop_line_in.color->blue = 0xfff0; - } - else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0xffff; - prop_line_in.color->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_ZOMBIE) - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT) - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0x0000; - prop_line_in.color->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_RUN) - { - prop_line_in.color->red = 0x0000; - prop_line_in.color->green = 0xffff; - prop_line_in.color->blue = 0x0000; - } - else - { - prop_line_in.color->red = 0xffff; - prop_line_in.color->green = 0xffff; - prop_line_in.color->blue = 0xffff; - } - - draw_line((void*)&prop_line_in, (void*)draw_context_in); - g_free(prop_line_in.color); - //gdk_gc_unref(draw_context_in->gc); - } - - return 0; -#endif //0 - /* Text dump */ @@ -1489,527 +810,43 @@ int after_schedchange_hook(void *hook_data, void *call_data) } } return 0; +} +/* before_execmode_hook + * + * This function basically draw lines and icons. Two types of lines are drawn : + * one small (3 pixels?) representing the state of the process and the second + * type is thicker (10 pixels?) representing on which CPU a process is running + * (and this only in running state). + * + * Extremums of the lines : + * x_min : time of the last event context for this process kept in memory. + * x_max : time of the current event. + * y : middle of the process in the process list. The process is found in the + * list, therefore is it's position in pixels. + * + * The choice of lines'color is defined by the context of the last event for this + * process. + */ + -#if 0 - EventsRequest *events_request = (EventsRequest*)hook_data; +int before_execmode_hook(void *hook_data, void *call_data) +{ + LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; + EventsRequest *events_request = (EventsRequest*)thf->hook_data; ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; - LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; - + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + LttEvent *e; - e = tfc->e; - - LttTime evtime = ltt_event_time(e); - TimeWindow time_window = - lttvwindow_get_time_window(control_flow_data->tab); - - LttTime time_window.end_time = time_window.time_window.end_time; - - //if(time < time_beg || time > time_end) return; - if(ltt_time_compare(evtime, time_window.start_time) == -1 - || ltt_time_compare(evtime, time_window.end_time) == 1) - return; - - - if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) - { - g_debug("schedchange!"); - - /* Add process to process list (if not present) and get drawing "y" from - * process position */ - guint pid_out, pid_in; - LttvProcessState *process_out, *process_in; - LttTime birth; - guint y_in = 0, y_out = 0, height = 0, pl_height = 0; - - ProcessList *process_list = control_flow_data->process_list; - - - LttField *f = ltt_event_field(e); - LttField *element; - element = ltt_field_member(f,0); - pid_out = ltt_event_get_long_unsigned(e,element); - element = ltt_field_member(f,1); - pid_in = ltt_event_get_long_unsigned(e,element); - //g_debug("out : %u in : %u", pid_out, pid_in); - - - /* Find process pid_out in the list... */ - process_out = lttv_state_find_process(tfs, pid_out); - if(process_out == NULL) return 0; - //g_debug("out : %s",g_quark_to_string(process_out->state->s)); - - birth = process_out->creation_time; - gchar *name = strdup(g_quark_to_string(process_out->name)); - HashedProcessData *hashed_process_data_out = NULL; - - if(processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid_out, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_out); - processlist_get_process_pixels(process_list, - pid_out, - &birth, - tfc->t_context->index, - &y_out, - &height, - &hashed_process_data_out); - drawing_insert_square( control_flow_data->drawing, y_out, height); - } - - g_free(name); - - /* Find process pid_in in the list... */ - process_in = lttv_state_find_process(tfs, pid_in); - if(process_in == NULL) return 0; - //g_debug("in : %s",g_quark_to_string(process_in->state->s)); - - birth = process_in->creation_time; - name = strdup(g_quark_to_string(process_in->name)); - HashedProcessData *hashed_process_data_in = NULL; - - if(processlist_get_process_pixels(process_list, - pid_in, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in) == 1) - { - /* Process not present */ - processlist_add(process_list, - pid_in, - &birth, - tfc->t_context->index, - name, - &pl_height, - &hashed_process_data_in); - processlist_get_process_pixels(process_list, - pid_in, - &birth, - tfc->t_context->index, - &y_in, - &height, - &hashed_process_data_in); - - drawing_insert_square( control_flow_data->drawing, y_in, height); - } - g_free(name); - - - /* Find pixels corresponding to time of the event. If the time does - * not fit in the window, show a warning, not supposed to happend. */ - //guint x = 0; - //guint width = control_flow_data->drawing->drawing_area->allocation.width; - - //LttTime time = ltt_event_time(e); - - //LttTime window_end = time_window->time_window.end_time; - - - //convert_time_to_pixels( - // *time_window, - // time, - // width, - // &x); - - //assert(x <= width); - - /* draw what represents the event for outgoing process. */ - - DrawContext *draw_context_out = hashed_process_data_out->draw_context; - //draw_context_out->current->modify_over->x = x; - draw_context_out->current->modify_over->y = y_out; - draw_context_out->current->modify_under->y = y_out+(height/2)+2; - draw_context_out->drawable = control_flow_data->drawing->pixmap; - draw_context_out->pango_layout = control_flow_data->drawing->pango_layout; - GtkWidget *widget = control_flow_data->drawing->drawing_area; - //draw_context_out->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - - //draw_arc((void*)&prop_arc, (void*)draw_context_out); - //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); - - /*if(process_out->state->s == LTTV_STATE_RUN) - { - draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); - PropertiesBG prop_bg; - prop_bg.color = g_new(GdkColor,1); - - prop_bg.color->red = 0xffff; - prop_bg.color->green = 0xffff; - prop_bg.color->blue = 0xffff; - - draw_bg((void*)&prop_bg, (void*)draw_context_out); - g_free(prop_bg.color); - gdk_gc_unref(draw_context_out->gc); - }*/ - - draw_context_out->gc = widget->style->black_gc; - - GdkColor colorfg_out = { 0, 0xffff, 0x0000, 0x0000 }; - GdkColor colorbg_out = { 0, 0x0000, 0x0000, 0x0000 }; - PropertiesText prop_text_out; - prop_text_out.foreground = &colorfg_out; - prop_text_out.background = &colorbg_out; - prop_text_out.size = 6; - prop_text_out.position = OVER; - - /* color of text : status of the process */ - if(process_out->state->s == LTTV_STATE_UNNAMED) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - { - prop_text_out.foreground->red = 0x0fff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0xfff0; - } - else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_ZOMBIE) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0x0000; - prop_text_out.foreground->blue = 0xffff; - } - else if(process_out->state->s == LTTV_STATE_WAIT) - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0x0000; - prop_text_out.foreground->blue = 0x0000; - } - else if(process_out->state->s == LTTV_STATE_RUN) - { - prop_text_out.foreground->red = 0x0000; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0x0000; - } - else - { - prop_text_out.foreground->red = 0xffff; - prop_text_out.foreground->green = 0xffff; - prop_text_out.foreground->blue = 0xffff; - } - - /* Print status of the process : U, WF, WC, E, W, R */ - if(process_out->state->s == LTTV_STATE_UNNAMED) - prop_text_out.text = "U"; - else if(process_out->state->s == LTTV_STATE_WAIT_FORK) - prop_text_out.text = "WF"; - else if(process_out->state->s == LTTV_STATE_WAIT_CPU) - prop_text_out.text = "WC"; - else if(process_out->state->s == LTTV_STATE_ZOMBIE) - prop_text_out.text = "E"; - else if(process_out->state->s == LTTV_STATE_WAIT) - prop_text_out.text = "W"; - else if(process_out->state->s == LTTV_STATE_RUN) - prop_text_out.text = "R"; - else - prop_text_out.text = "U"; - - draw_text((void*)&prop_text_out, (void*)draw_context_out); - - //gdk_gc_unref(draw_context_out->gc); - - draw_context_out->current->middle->y = y_out+height/2; - draw_context_out->current->over->y = y_out; - draw_context_out->current->under->y = y_out+height; - draw_context_out->current->status = process_out->state->s; - - /* for pid_out : remove previous, Prev = current, new current (default) */ - g_free(draw_context_out->previous->modify_under); - g_free(draw_context_out->previous->modify_middle); - g_free(draw_context_out->previous->modify_over); - g_free(draw_context_out->previous->under); - g_free(draw_context_out->previous->middle); - g_free(draw_context_out->previous->over); - g_free(draw_context_out->previous); - - draw_context_out->previous = draw_context_out->current; - - draw_context_out->current = g_new(DrawInfo,1); - draw_context_out->current->over = g_new(ItemInfo,1); - draw_context_out->current->over->x = -1; - draw_context_out->current->over->y = -1; - draw_context_out->current->middle = g_new(ItemInfo,1); - draw_context_out->current->middle->x = -1; - draw_context_out->current->middle->y = -1; - draw_context_out->current->under = g_new(ItemInfo,1); - draw_context_out->current->under->x = -1; - draw_context_out->current->under->y = -1; - draw_context_out->current->modify_over = g_new(ItemInfo,1); - draw_context_out->current->modify_over->x = -1; - draw_context_out->current->modify_over->y = -1; - draw_context_out->current->modify_middle = g_new(ItemInfo,1); - draw_context_out->current->modify_middle->x = -1; - draw_context_out->current->modify_middle->y = -1; - draw_context_out->current->modify_under = g_new(ItemInfo,1); - draw_context_out->current->modify_under->x = -1; - draw_context_out->current->modify_under->y = -1; - draw_context_out->current->status = LTTV_STATE_UNNAMED; - - /* Finally, update the drawing context of the pid_in. */ - - DrawContext *draw_context_in = hashed_process_data_in->draw_context; - //draw_context_in->current->modify_over->x = x; - draw_context_in->current->modify_over->y = y_in; - draw_context_in->current->modify_under->y = y_in+(height/2)+2; - draw_context_in->drawable = control_flow_data->drawing->pixmap; - draw_context_in->pango_layout = control_flow_data->drawing->pango_layout; - widget = control_flow_data->drawing->drawing_area; - //draw_context_in->gc = widget->style->fg_gc[GTK_WIDGET_STATE (widget)]; - - //draw_arc((void*)&prop_arc, (void*)draw_context_in); - //test_draw_item(control_flow_data->drawing, control_flow_data->drawing->pixmap); - - /*if(process_in->state->s == LTTV_STATE_RUN) - { - draw_context_in->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(draw_context_in->gc, widget->style->black_gc); - PropertiesBG prop_bg; - prop_bg.color = g_new(GdkColor,1); - - prop_bg.color->red = 0xffff; - prop_bg.color->green = 0xffff; - prop_bg.color->blue = 0xffff; - - draw_bg((void*)&prop_bg, (void*)draw_context_in); - g_free(prop_bg.color); - gdk_gc_unref(draw_context_in->gc); - }*/ - - draw_context_in->gc = widget->style->black_gc; - - GdkColor colorfg_in = { 0, 0x0000, 0xffff, 0x0000 }; - GdkColor colorbg_in = { 0, 0x0000, 0x0000, 0x0000 }; - PropertiesText prop_text_in; - prop_text_in.foreground = &colorfg_in; - prop_text_in.background = &colorbg_in; - prop_text_in.size = 6; - prop_text_in.position = OVER; - - /* foreground of text : status of the process */ - if(process_in->state->s == LTTV_STATE_UNNAMED) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - { - prop_text_in.foreground->red = 0x0fff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xfff0; - } - else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_ZOMBIE) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0x0000; - prop_text_in.foreground->blue = 0xffff; - } - else if(process_in->state->s == LTTV_STATE_WAIT) - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0x0000; - prop_text_in.foreground->blue = 0x0000; - } - else if(process_in->state->s == LTTV_STATE_RUN) - { - prop_text_in.foreground->red = 0x0000; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0x0000; - } - else - { - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xffff; - } - - - /* Print status of the process : U, WF, WC, E, W, R */ - if(process_in->state->s == LTTV_STATE_UNNAMED) - prop_text_in.text = "U"; - else if(process_in->state->s == LTTV_STATE_WAIT_FORK) - prop_text_in.text = "WF"; - else if(process_in->state->s == LTTV_STATE_WAIT_CPU) - prop_text_in.text = "WC"; - else if(process_in->state->s == LTTV_STATE_ZOMBIE) - prop_text_in.text = "E"; - else if(process_in->state->s == LTTV_STATE_WAIT) - prop_text_in.text = "W"; - else if(process_in->state->s == LTTV_STATE_RUN) - prop_text_in.text = "R"; - else - prop_text_in.text = "U"; - - draw_text((void*)&prop_text_in, (void*)draw_context_in); - - - if(process_in->state->s == LTTV_STATE_RUN) - { - gchar tmp[255]; - prop_text_in.foreground = &colorfg_in; - prop_text_in.background = &colorbg_in; - prop_text_in.foreground->red = 0xffff; - prop_text_in.foreground->green = 0xffff; - prop_text_in.foreground->blue = 0xffff; - prop_text_in.size = 6; - prop_text_in.position = UNDER; - - prop_text_in.text = g_new(gchar, 260); - strcpy(prop_text_in.text, "CPU "); - snprintf(tmp, 255, "%u", ltt_tracefile_num(tfc->tf)); - strcat(prop_text_in.text, tmp); - - draw_text((void*)&prop_text_in, (void*)draw_context_in); - g_free(prop_text_in.text); - } - - - draw_context_in->current->middle->y = y_in+height/2; - draw_context_in->current->over->y = y_in; - draw_context_in->current->under->y = y_in+height; - draw_context_in->current->status = process_in->state->s; - - /* for pid_in : remove previous, Prev = current, new current (default) */ - g_free(draw_context_in->previous->modify_under); - g_free(draw_context_in->previous->modify_middle); - g_free(draw_context_in->previous->modify_over); - g_free(draw_context_in->previous->under); - g_free(draw_context_in->previous->middle); - g_free(draw_context_in->previous->over); - g_free(draw_context_in->previous); - - draw_context_in->previous = draw_context_in->current; - - draw_context_in->current = g_new(DrawInfo,1); - draw_context_in->current->over = g_new(ItemInfo,1); - draw_context_in->current->over->x = -1; - draw_context_in->current->over->y = -1; - draw_context_in->current->middle = g_new(ItemInfo,1); - draw_context_in->current->middle->x = -1; - draw_context_in->current->middle->y = -1; - draw_context_in->current->under = g_new(ItemInfo,1); - draw_context_in->current->under->x = -1; - draw_context_in->current->under->y = -1; - draw_context_in->current->modify_over = g_new(ItemInfo,1); - draw_context_in->current->modify_over->x = -1; - draw_context_in->current->modify_over->y = -1; - draw_context_in->current->modify_middle = g_new(ItemInfo,1); - draw_context_in->current->modify_middle->x = -1; - draw_context_in->current->modify_middle->y = -1; - draw_context_in->current->modify_under = g_new(ItemInfo,1); - draw_context_in->current->modify_under->x = -1; - draw_context_in->current->modify_under->y = -1; - draw_context_in->current->status = LTTV_STATE_UNNAMED; - - } - - return 0; -#endif //0 -} - -#if 0 -static inline PropertiesLine prepare_execmode_line(LttvProcessState *process) -{ - PropertiesLine prop_line; - prop_line.line_width = 1; - prop_line.style = GDK_LINE_SOLID; - prop_line.y = OVER; - //GdkColormap *colormap = gdk_colormap_get_system(); - - /* color of line : execution mode of the process */ - if(process->state->t == LTTV_STATE_USER_MODE) - prop_line.color = drawing_colors[COL_USER_MODE]; - else if(process->state->t == LTTV_STATE_SYSCALL) - prop_line.color = drawing_colors[COL_SYSCALL]; - else if(process->state->t == LTTV_STATE_TRAP) - prop_line.color = drawing_colors[COL_TRAP]; - else if(process->state->t == LTTV_STATE_IRQ) - prop_line.color = drawing_colors[COL_IRQ]; - else if(process->state->t == LTTV_STATE_MODE_UNKNOWN) - prop_line.color = drawing_colors[COL_MODE_UNKNOWN]; - else - prop_line.color = drawing_colors[COL_WHITE]; - - //gdk_colormap_alloc_color(colormap, - // prop_line.color, - // FALSE, - // TRUE); - - return prop_line; - -} -#endif //0 - - -/* before_execmode_hook - * - * This function basically draw lines and icons. Two types of lines are drawn : - * one small (3 pixels?) representing the state of the process and the second - * type is thicker (10 pixels?) representing on which CPU a process is running - * (and this only in running state). - * - * Extremums of the lines : - * x_min : time of the last event context for this process kept in memory. - * x_max : time of the current event. - * y : middle of the process in the process list. The process is found in the - * list, therefore is it's position in pixels. - * - * The choice of lines'color is defined by the context of the last event for this - * process. - */ - - -int before_execmode_hook(void *hook_data, void *call_data) -{ - LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; - EventsRequest *events_request = (EventsRequest*)thf->hook_data; - ControlFlowData *control_flow_data = events_request->viewer_data; - - LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; - - LttvTracefileState *tfs = (LttvTracefileState *)call_data; - - LttvTraceState *ts = (LttvTraceState *)tfc->t_context; - - LttEvent *e; - e = ltt_tracefile_get_event(tfc->tf); + e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); @@ -2178,93 +1015,117 @@ int before_execmode_hook(void *hook_data, void *call_data) return 0; } -/* after_execmode_hook +/* before_process_exit_hook * - * The draw after hook is called by the reading API to have a - * particular event drawn on the screen. + * Draw lines for process event. + * * @param hook_data ControlFlowData structure of the viewer. * @param call_data Event context. * * This function adds items to be drawn in a queue for each process. * */ -#if 0 -int after_execmode_hook(void *hook_data, void *call_data) -{ - /**************** DOES NOTHING!! *************/ - /* hook desactivated in drawing.c */ - return 0; +int before_process_exit_hook(void *hook_data, void *call_data) +{ LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data; EventsRequest *events_request = (EventsRequest*)thf->hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts = (LttvTraceState *)tfc->t_context; + LttEvent *e; e = ltt_tracefile_get_event(tfc->tf); LttTime evtime = ltt_event_time(e); /* Add process to process list (if not present) */ - LttvProcessState *process; + //LttvProcessState *process = tfs->process; + guint cpu = ltt_tracefile_num(tfc->tf); + LttvProcessState *process = ts->running_process[cpu]; + guint pid = process->pid; LttTime birth; guint pl_height = 0; HashedProcessData *hashed_process_data = NULL; ProcessList *process_list = control_flow_data->process_list; - - /* Find process pid_in in the list... */ - process = tfs->process; - /* It should exist, because we are after the state update. */ + g_assert(process != NULL); - guint pid = process->pid; - birth = process->creation_time; - if(likely(process_list->current_hash_data[ltt_tracefile_num(tfc->tf)] != NULL)) { - hashed_process_data = process_list->current_hash_data[ltt_tracefile_num(tfc->tf)]; + if(likely(process_list->current_hash_data[cpu] != NULL)) { + hashed_process_data = process_list->current_hash_data[cpu]; } else { hashed_process_data = processlist_get_process_data(process_list, - pid, - process->last_cpu_index, - &birth, - tfc->t_context->index); + pid, + process->cpu, + &birth, + tfc->t_context->index); if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); /* Process not present */ Drawing_t *drawing = control_flow_data->drawing; - const gchar *name = g_quark_to_string(process->name); ProcessInfo *process_info; processlist_add(process_list, drawing, pid, - process->last_cpu_index, + process->cpu, process->ppid, &birth, tfc->t_context->index, - name, + process->name, &pl_height, &process_info, &hashed_process_data); - gtk_widget_set_size_request(drawing->drawing_area, - -1, - pl_height); - gtk_widget_queue_draw(drawing->drawing_area); + gtk_widget_set_size_request(drawing->drawing_area, + -1, + pl_height); + gtk_widget_queue_draw(drawing->drawing_area); } - /* Set the current process */ - process_list->current_hash_data[process->last_cpu_index] = - hashed_process_data; } - if(unlikely(ltt_time_compare(hashed_process_data->next_good_time, - evtime) <= 0)) + /* Now, the process is in the state hash and our own process hash. + * We definitely can draw the items related to the ending state. + */ + + if(likely(ltt_time_compare(hashed_process_data->next_good_time, + evtime) > 0)) { + if(unlikely(hashed_process_data->x.middle_marked == FALSE)) { + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + +#ifdef EXTRA_CHECK + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, time_window.end_time) == 1) + return; +#endif //EXTRA_CHECK + Drawing_t *drawing = control_flow_data->drawing; + guint width = drawing->width; + guint x; + convert_time_to_pixels( + time_window, + evtime, + width, + &x); + + /* Draw collision indicator */ + gdk_gc_set_foreground(drawing->gc, &drawing_colors[COL_WHITE]); + gdk_draw_point(hashed_process_data->pixmap, + drawing->gc, + x, + (hashed_process_data->height/2)-3); + hashed_process_data->x.middle_marked = TRUE; + } + } else { TimeWindow time_window = lttvwindow_get_time_window(control_flow_data->tab); @@ -2275,154 +1136,13 @@ int after_execmode_hook(void *hook_data, void *call_data) #endif //EXTRA_CHECK Drawing_t *drawing = control_flow_data->drawing; guint width = drawing->width; - guint new_x; - + guint x; + convert_time_to_pixels( time_window, evtime, width, - &new_x); - - 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; -} -#endif //0 - - - -/* 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; - - LttvTraceState *ts = (LttvTraceState *)tfc->t_context; - - 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 cpu = ltt_tracefile_num(tfc->tf); - LttvProcessState *process = ts->running_process[cpu]; - guint pid = process->pid; - LttTime birth; - guint pl_height = 0; - HashedProcessData *hashed_process_data = NULL; - - ProcessList *process_list = control_flow_data->process_list; - - g_assert(process != NULL); - - birth = process->creation_time; - - if(likely(process_list->current_hash_data[cpu] != NULL)) { - hashed_process_data = process_list->current_hash_data[cpu]; - } else { - hashed_process_data = processlist_get_process_data(process_list, - pid, - process->cpu, - &birth, - tfc->t_context->index); - if(unlikely(hashed_process_data == NULL)) - { - g_assert(pid == 0 || pid != process->ppid); - /* Process not present */ - Drawing_t *drawing = control_flow_data->drawing; - ProcessInfo *process_info; - processlist_add(process_list, - drawing, - pid, - process->cpu, - process->ppid, - &birth, - tfc->t_context->index, - process->name, - &pl_height, - &process_info, - &hashed_process_data); - gtk_widget_set_size_request(drawing->drawing_area, - -1, - pl_height); - gtk_widget_queue_draw(drawing->drawing_area); - } - } - - /* Now, the process is in the state hash and our own process hash. - * 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); + &x); /* Jump over draw if we are at the same x position */ @@ -2614,342 +1334,15 @@ int before_process_release_hook(void *hook_data, void *call_data) 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; -} - - - - - - - - -#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; - ProcessInfo *process_info; - processlist_add(process_list, - drawing, - pid, - process->last_cpu_index, - process->ppid, - &birth, - tfc->t_context->index, - process->name, - &pl_height, - &process_info, - &hashed_process_data); - gtk_widget_set_size_request(drawing->drawing_area, - -1, - pl_height); - gtk_widget_queue_draw(drawing->drawing_area); - } - - /* Now, the process is in the state hash and our own process hash. - * 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); + 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; - 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, @@ -2958,86 +1351,51 @@ int before_process_hook(void *hook_data, void *call_data) (hashed_process_data->height/2)-3); hashed_process_data->x.middle_marked = TRUE; } + /* jump */ } 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; + DrawContext draw_context; - 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; + /* 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.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_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 the line */ - PropertiesLine prop_line = prepare_s_e_line(process); - draw_line((void*)&prop_line, (void*)&draw_context); + 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; - } - /* 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; + { + /* Draw the line */ + PropertiesLine prop_line = prepare_s_e_line(process); + draw_line((void*)&prop_line, (void*)&draw_context); - /* Calculate the next good time */ - convert_pixels_to_time(width, x+1, time_window, - &hashed_process_data->next_good_time); } + /* 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; + return 0; } -#endif //0 + @@ -3272,217 +1630,6 @@ int after_process_exit_hook(void *hook_data, void *call_data) } -#if 0 - -/* after_process_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_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; - 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 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; - } - } - - } 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 pl_height = 0; - HashedProcessData *hashed_process_data = NULL; - - ProcessList *process_list = control_flow_data->process_list; - - /* It should exist, because we are after the state update. */ - 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); - } - - /* 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; - -} -#endif //0 - /* Get the filename of the process to print */ int after_fs_exec_hook(void *hook_data, void *call_data) { @@ -3814,7 +1961,7 @@ gint redraw_notify(void *hook_data, void *call_data) -1); gtk_widget_queue_draw(drawing->drawing_area); - + if(drawing->damage_begin < drawing->damage_end) { drawing_data_request(drawing, -- 2.34.1