X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=19d004b9a32b3664438db8c70fbbd355e635bee0;hb=51ef553b4090bc51a29afac5e95da8afff995d86;hp=8a5c6b9ad8262fe07eacd03a9928b4cba83b4515;hpb=d0cd7f0949c2fd90d5a39361b192c9b2d96bf5d4;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 8a5c6b9a..19d004b9 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -22,8 +22,29 @@ *****************************************************************************/ -#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format) -#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format) +/* Event hooks are the drawing hooks called during traceset read. They draw the + * icons, text, lines and background color corresponding to the events read. + * + * Two hooks are used for drawing : draw_before and draw_after hooks. The + * draw_before is called before the state update that occurs with an event and + * the draw_after hook is called after this state update. + * + * The draw_before hooks fulfill the task of drawing the visible objects that + * corresponds to the data accumulated by the draw_after hook. + * + * The draw_after hook accumulates the data that need to be shown on the screen + * (items) into a queue. Then, the next draw_before hook will draw what that + * queue contains. That's the Right Way (TM) of drawing items on the screen, + * because we need to draw the background first (and then add icons, text, ... + * over it), but we only know the length of a background region once the state + * corresponding to it is over, which happens to be at the next draw_before + * hook. + * + * We also have a hook called at the end of a chunk to draw the information left + * undrawn in each process queue. We use the current time as end of + * line/background. + */ + //#define PANGO_ENABLE_BACKEND #include @@ -39,10 +60,11 @@ #include #include +#include #include -#include #include -#include +#include +#include #include "eventhooks.h" @@ -55,44 +77,195 @@ #define MAX_PATH_LEN 256 +#if 0 +typedef struct _ProcessAddClosure { + ControlFlowData *cfd; + guint trace_num; +} ProcessAddClosure; + +static void process_add(gpointer key, + gpointer value, + gpointer user_data) +{ + LttvProcessState *process = (LttvProcessState*)value; + ProcessAddClosure *closure = (ProcessAddClosure*)user_data; + ControlFlowData *control_flow_data = closure->cfd; + guint trace_num = closure->trace_num; + + /* Add process to process list (if not present) */ + guint pid; + LttTime birth; + guint y = 0, height = 0, pl_height = 0; + + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + 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. + * + * Eventually, will have to check that every requested traces are finished + * before doing the redraw. It will save unnecessary processor usage. + */ + +gint background_ready(void *hook_data, void *call_data) +{ + ControlFlowData *control_flow_data = (ControlFlowData *)hook_data; + LttvTrace *trace = (LttvTrace*)call_data; + LttvTracesetContext *tsc = + lttvwindow_get_traceset_context(control_flow_data->tab); + + g_debug("control flow viewer : background computation data ready."); + + drawing_clear(control_flow_data->drawing); + processlist_clear(control_flow_data->process_list); +#if 0 + { + gint num_traces = lttv_traceset_number(tsc->ts); + gint i; + LttvTraceState *ts; + ProcessAddClosure closure; + closure.cfd = control_flow_data; + + for(i=0;itraces[i]; + + closure.trace_num = i; + + /* add all the processes to the list */ + lttv_state_for_each_process(ts, (GHFunc)process_add, &closure); + } + } +#endif //0 + redraw_notify(control_flow_data, NULL); + + return 0; +} + + +/* Request background computation. Verify if it is in progress or ready first. + * + * Right now, for all loaded traces. + * + * Later : must be only for each trace in the tab's traceset. + */ +void request_background_data(ControlFlowData *control_flow_data) +{ + gint num_traces = lttvwindowtraces_get_number(); + gint i; + LttvTrace *trace; + + LttvHooks *background_ready_hook = + lttv_hooks_new(); + lttv_hooks_add(background_ready_hook, background_ready, control_flow_data, + LTTV_PRIO_DEFAULT); + + for(i=0;imw = mw; - TimeWindow *time_window = guicontrolflow_get_time_window(control_flow_data); - time_window->start_time.tv_sec = 0; - time_window->start_time.tv_nsec = 0; - time_window->time_width.tv_sec = 0; - time_window->time_width.tv_nsec = 0; - - LttTime *current_time = guicontrolflow_get_current_time(control_flow_data); - current_time->tv_sec = 0; - current_time->tv_nsec = 0; + control_flow_data->tab = tab; - //g_critical("time width1 : %u",time_window->time_width); + //g_debug("time width2 : %u",time_window->time_width); + // Unreg done in the GuiControlFlow_Destructor + lttvwindow_register_traceset_notify(tab, + traceset_notify, + control_flow_data); + + lttvwindow_register_time_window_notify(tab, + update_time_window_hook, + control_flow_data); + lttvwindow_register_current_time_notify(tab, + update_current_time_hook, + control_flow_data); + lttvwindow_register_redraw_notify(tab, + redraw_notify, + control_flow_data); + lttvwindow_register_continue_notify(tab, + continue_notify, + control_flow_data); + request_background_data(control_flow_data); - get_time_window(mw, - time_window); - get_current_time(mw, - current_time); - //g_critical("time width2 : %u",time_window->time_width); - // Unreg done in the GuiControlFlow_Destructor - reg_update_time_window(update_time_window_hook, control_flow_data, - mw); - reg_update_current_time(update_current_time_hook, control_flow_data, - mw); return guicontrolflow_get_widget(control_flow_data) ; } @@ -102,34 +275,12 @@ int event_selected_hook(void *hook_data, void *call_data) ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; guint *event_number = (guint*) call_data; - g_critical("DEBUG : event selected by main window : %u", *event_number); - -// control_flow_data->currently_Selected_Event = *event_number; -// control_flow_data->Selected_Event = TRUE ; - -// tree_v_set_cursor(control_flow_data); - -} - -/* Hook called before drawing. Gets the initial context at the beginning of the - * drawing interval and copy it to the context in event_request. - */ -int draw_before_hook(void *hook_data, void *call_data) -{ - EventRequest *event_request = (EventRequest*)hook_data; - //EventsContext Events_Context = (EventsContext*)call_data; + g_debug("DEBUG : event selected by main window : %u", *event_number); - //event_request->Events_Context = Events_Context; - - return 0; } -/* - * The draw event hook is called by the reading API to have a - * particular event drawn on the screen. - * @param hook_data ControlFlowData structure of the viewer. - * @param call_data Event context. - * +/* draw_before_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 @@ -144,33 +295,147 @@ int draw_before_hook(void *hook_data, void *call_data) * The choice of lines'color is defined by the context of the last event for this * process. */ -int draw_event_hook(void *hook_data, void *call_data) + + +int draw_before_hook(void *hook_data, void *call_data) { - EventRequest *event_request = (EventRequest*)hook_data; - ControlFlowData *control_flow_data = event_request->control_flow_data; + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + + LttEvent *e; + e = tfc->e; + + LttTime evtime = ltt_event_time(e); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); + + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + guint width = control_flow_data->drawing->width; + + if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { + + /* 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); + } + /* 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_out = 0, height = 0, pl_height = 0; + HashedProcessData *hashed_process_data = NULL; + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + LttTime birth = process->creation_time; + const gchar *name = g_quark_to_string(process->name); + + if(processlist_get_process_pixels(process_list, + pid_out, + &birth, + tfc->t_context->index, + &y_out, + &height, + &hashed_process_data) == 1) + { + /* Process not present */ + processlist_add(process_list, + pid_out, + &birth, + tfc->t_context->index, + name, + &pl_height, + &hashed_process_data); + processlist_get_process_pixels(process_list, + pid_out, + &birth, + tfc->t_context->index, + &y_out, + &height, + &hashed_process_data); + drawing_insert_square( control_flow_data->drawing, y_out, 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 != -1); + + + } + } + + + 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 = - guicontrolflow_get_time_window(control_flow_data); + TimeWindow time_window = + lttvwindow_get_time_window(tab); - LttTime end_time = ltt_time_add(time_window->start_time, - time_window->time_width); + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); //if(time < time_beg || time > time_end) return; - if(ltt_time_compare(evtime, time_window->start_time) == -1 + if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { - g_critical("schedchange!"); + g_debug("schedchange!"); /* Add process to process list (if not present) and get drawing "y" from * process position */ @@ -180,7 +445,7 @@ int draw_event_hook(void *hook_data, void *call_data) guint y_in = 0, y_out = 0, height = 0, pl_height = 0; ProcessList *process_list = - guicontrolflow_get_process_list(event_request->control_flow_data); + guicontrolflow_get_process_list(control_flow_data); LttField *f = ltt_event_field(e); @@ -189,15 +454,16 @@ int draw_event_hook(void *hook_data, void *call_data) pid_out = ltt_event_get_long_unsigned(e,element); element = ltt_field_member(f,1); pid_in = ltt_event_get_long_unsigned(e,element); - g_critical("out : %u in : %u", pid_out, pid_in); + g_debug("out : %u in : %u", pid_out, pid_in); /* Find process pid_out in the list... */ process_out = lttv_state_find_process(tfs, pid_out); - g_critical("out : %s",g_quark_to_string(process_out->state->s)); - + if(process_out == NULL) return 0; + g_debug("out : %s",g_quark_to_string(process_out->state->s)); + birth = process_out->creation_time; - gchar *name = strdup(g_quark_to_string(process_out->name)); + const gchar *name = g_quark_to_string(process_out->name); HashedProcessData *hashed_process_data_out = NULL; if(processlist_get_process_pixels(process_list, @@ -208,32 +474,32 @@ int draw_event_hook(void *hook_data, void *call_data) &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( event_request->control_flow_data->drawing, y_out, height); + /* 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); + //g_free(name); /* Find process pid_in in the list... */ process_in = lttv_state_find_process(tfs, pid_in); - g_critical("in : %s",g_quark_to_string(process_in->state->s)); + if(process_in == NULL) return 0; + g_debug("in : %s",g_quark_to_string(process_in->state->s)); birth = process_in->creation_time; - name = strdup(g_quark_to_string(process_in->name)); + name = g_quark_to_string(process_in->name); HashedProcessData *hashed_process_data_in = NULL; if(processlist_get_process_pixels(process_list, @@ -244,7 +510,7 @@ int draw_event_hook(void *hook_data, void *call_data) &height, &hashed_process_data_in) == 1) { - /* Process not present */ + /* Process not present */ processlist_add(process_list, pid_in, &birth, @@ -260,30 +526,30 @@ int draw_event_hook(void *hook_data, void *call_data) &height, &hashed_process_data_in); - drawing_insert_square( event_request->control_flow_data->drawing, y_in, height); + drawing_insert_square( control_flow_data->drawing, y_in, height); } - g_free(name); + //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; + guint width = control_flow_data->drawing->width; LttTime time = ltt_event_time(e); - LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width, - control_flow_data->time_window.start_time); + LttTime window_end = ltt_time_add(time_window.time_width, + time_window.start_time); convert_time_to_pixels( - control_flow_data->time_window.start_time, + time_window.start_time, window_end, time, width, &x); //assert(x <= width); - + // /* draw what represents the event for outgoing process. */ DrawContext *draw_context_out = hashed_process_data_out->draw_context; @@ -305,11 +571,14 @@ int draw_event_hook(void *hook_data, void *call_data) /* Draw the line/background of the out process */ if(draw_context_out->previous->middle->x == -1) { - draw_context_out->previous->over->x = event_request->x_begin; - draw_context_out->previous->middle->x = event_request->x_begin; - draw_context_out->previous->under->x = event_request->x_begin; - - g_critical("out middle x_beg : %u",event_request->x_begin); + 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; @@ -327,8 +596,9 @@ int draw_event_hook(void *hook_data, void *call_data) 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 = 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); @@ -360,10 +630,10 @@ int draw_event_hook(void *hook_data, void *call_data) prop_bg.color->blue = 0xe7e7; } - g_critical("calling from draw_event"); + 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); + //gdk_gc_unref(draw_context_out->gc); } draw_context_out->gc = widget->style->black_gc; @@ -440,8 +710,9 @@ int draw_event_hook(void *hook_data, void *call_data) draw_text((void*)&prop_text_out, (void*)draw_context_out); //gdk_gc_unref(draw_context_out->gc); - draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); + //draw_context_out->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + //gdk_gc_copy(draw_context_out->gc, widget->style->black_gc); + draw_context_out->gc = control_flow_data->drawing->gc; PropertiesLine prop_line_out; prop_line_out.color = g_new(GdkColor,1); @@ -449,7 +720,7 @@ int draw_event_hook(void *hook_data, void *call_data) prop_line_out.style = GDK_LINE_SOLID; prop_line_out.position = MIDDLE; - g_critical("out state : %s", g_quark_to_string(process_out->state->s)); + 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) @@ -497,7 +768,7 @@ int draw_event_hook(void *hook_data, void *call_data) draw_line((void*)&prop_line_out, (void*)draw_context_out); g_free(prop_line_out.color); - gdk_gc_unref(draw_context_out->gc); + //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. */ @@ -521,10 +792,15 @@ int draw_event_hook(void *hook_data, void *call_data) /* Draw the line/bg of the in process */ if(draw_context_in->previous->middle->x == -1) { - draw_context_in->previous->middle->x = event_request->x_begin; - draw_context_in->previous->over->x = event_request->x_begin; - draw_context_in->previous->under->x = event_request->x_begin; - g_critical("in middle x_beg : %u",event_request->x_begin); + 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; @@ -543,8 +819,9 @@ int draw_event_hook(void *hook_data, void *call_data) 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 = 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); @@ -579,7 +856,7 @@ int draw_event_hook(void *hook_data, void *call_data) draw_bg((void*)&prop_bg, (void*)draw_context_in); g_free(prop_bg.color); - gdk_gc_unref(draw_context_in->gc); + //gdk_gc_unref(draw_context_in->gc); } draw_context_in->gc = widget->style->black_gc; @@ -592,7 +869,7 @@ int draw_event_hook(void *hook_data, void *call_data) prop_text_in.size = 6; prop_text_in.position = OVER; - g_critical("in state : %s", g_quark_to_string(process_in->state->s)); + 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) { @@ -658,8 +935,9 @@ int draw_event_hook(void *hook_data, void *call_data) 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 = 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); @@ -713,12 +991,15 @@ int draw_event_hook(void *hook_data, void *call_data) draw_line((void*)&prop_line_in, (void*)draw_context_in); g_free(prop_line_in.color); - gdk_gc_unref(draw_context_in->gc); + //gdk_gc_unref(draw_context_in->gc); } return 0; +#endif //0 - /* Temp dump */ + + + /* Text dump */ #ifdef DONTSHOW GString *string = g_string_new("");; gboolean field_names = TRUE, state = TRUE; @@ -740,35 +1021,143 @@ int draw_event_hook(void *hook_data, void *call_data) } - +/* draw_after_hook + * + * The draw after hook is called by the reading API to have a + * particular event drawn on the screen. + * @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 draw_after_hook(void *hook_data, void *call_data) { - EventRequest *event_request = (EventRequest*)hook_data; - ControlFlowData *control_flow_data = event_request->control_flow_data; + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; + + LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; + + LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; + + LttEvent *e; + e = tfc->e; + + LttTime evtime = ltt_event_time(e); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); + + if(ltt_time_compare(evtime, time_window.start_time) == -1 + || ltt_time_compare(evtime, end_time) == 1) + return; + + guint width = control_flow_data->drawing->width; + + if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { + + 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); + } + + + /* 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); + + 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); + } + + convert_time_to_pixels( + time_window.start_time, + end_time, + evtime, + width, + &hashed_process_data_in->x); + } + } + return 0; + + + +#if 0 + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; LttvTracefileContext *tfc = (LttvTracefileContext *)call_data; LttvTracefileState *tfs = (LttvTracefileState *)call_data; + LttvTraceState *ts =(LttvTraceState *)LTTV_TRACEFILE_CONTEXT(tfs)->t_context; LttEvent *e; e = tfc->e; LttTime evtime = ltt_event_time(e); - TimeWindow *time_window = - guicontrolflow_get_time_window(control_flow_data); + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); - LttTime end_time = ltt_time_add(time_window->start_time, - time_window->time_width); + LttTime end_time = ltt_time_add(time_window.start_time, + time_window.time_width); //if(time < time_beg || time > time_end) return; - if(ltt_time_compare(evtime, time_window->start_time) == -1 + if(ltt_time_compare(evtime, time_window.start_time) == -1 || ltt_time_compare(evtime, end_time) == 1) return; if(strcmp(ltt_eventtype_name(ltt_event_eventtype(e)),"schedchange") == 0) { - g_critical("schedchange!"); + g_debug("schedchange!"); /* Add process to process list (if not present) and get drawing "y" from * process position */ @@ -778,7 +1167,7 @@ int draw_after_hook(void *hook_data, void *call_data) guint y_in = 0, y_out = 0, height = 0, pl_height = 0; ProcessList *process_list = - guicontrolflow_get_process_list(event_request->control_flow_data); + guicontrolflow_get_process_list(control_flow_data); LttField *f = ltt_event_field(e); @@ -787,12 +1176,13 @@ int draw_after_hook(void *hook_data, void *call_data) pid_out = ltt_event_get_long_unsigned(e,element); element = ltt_field_member(f,1); pid_in = ltt_event_get_long_unsigned(e,element); - //g_critical("out : %u in : %u", pid_out, pid_in); + //g_debug("out : %u in : %u", pid_out, pid_in); /* Find process pid_out in the list... */ process_out = lttv_state_find_process(tfs, pid_out); - //g_critical("out : %s",g_quark_to_string(process_out->state->s)); + if(process_out == NULL) return 0; + //g_debug("out : %s",g_quark_to_string(process_out->state->s)); birth = process_out->creation_time; gchar *name = strdup(g_quark_to_string(process_out->name)); @@ -806,29 +1196,30 @@ int draw_after_hook(void *hook_data, void *call_data) &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( event_request->control_flow_data->drawing, y_out, height); + /* 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); - //g_critical("in : %s",g_quark_to_string(process_in->state->s)); + if(process_in == NULL) return 0; + //g_debug("in : %s",g_quark_to_string(process_in->state->s)); birth = process_in->creation_time; name = strdup(g_quark_to_string(process_in->name)); @@ -858,7 +1249,7 @@ int draw_after_hook(void *hook_data, void *call_data) &height, &hashed_process_data_in); - drawing_insert_square( event_request->control_flow_data->drawing, y_in, height); + drawing_insert_square( control_flow_data->drawing, y_in, height); } g_free(name); @@ -870,12 +1261,12 @@ int draw_after_hook(void *hook_data, void *call_data) //LttTime time = ltt_event_time(e); - //LttTime window_end = ltt_time_add(control_flow_data->time_window.time_width, - // control_flow_data->time_window.start_time); + //LttTime window_end = ltt_time_add(time_window->time_width, + // time_window->start_time); //convert_time_to_pixels( - // control_flow_data->time_window.start_time, + // time_window->start_time, // window_end, // time, // width, @@ -1189,6 +1580,7 @@ int draw_after_hook(void *hook_data, void *call_data) } return 0; +#endif //0 } @@ -1197,9 +1589,15 @@ int draw_after_hook(void *hook_data, void *call_data) gint update_time_window_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + Drawing_t *drawing = control_flow_data->drawing; + + const TimeWindowNotifyData *time_window_nofify_data = + ((const TimeWindowNotifyData *)call_data); + TimeWindow *old_time_window = - guicontrolflow_get_time_window(control_flow_data); - TimeWindow *new_time_window = ((TimeWindow*)call_data); + time_window_nofify_data->old_time_window; + TimeWindow *new_time_window = + time_window_nofify_data->new_time_window; /* Update the ruler */ drawing_update_ruler(control_flow_data->drawing, @@ -1245,7 +1643,7 @@ gint update_time_window_hook(void *hook_data, void *call_data) g_info("scrolling near right"); /* Scroll right, keep right part of the screen */ guint x = 0; - guint width = control_flow_data->drawing->drawing_area->allocation.width; + guint width = control_flow_data->drawing->width; convert_time_to_pixels( *os, old_end, @@ -1259,36 +1657,35 @@ gint update_time_window_hook(void *hook_data, void *call_data) control_flow_data->drawing->pixmap, x, 0, 0, 0, - -1, -1); - - convert_time_to_pixels( - *ns, - new_end, - old_end, - width, - &x); + control_flow_data->drawing->width-x+SAFETY, -1); + + if(drawing->damage_begin == drawing->damage_end) + drawing->damage_begin = control_flow_data->drawing->width-x; + else + drawing->damage_begin = 0; + + drawing->damage_end = control_flow_data->drawing->width; - *old_time_window = *new_time_window; /* Clear the data request background, but not SAFETY */ gdk_draw_rectangle (control_flow_data->drawing->pixmap, + //control_flow_data->drawing->drawing_area->style->black_gc, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, - x+SAFETY, 0, - control_flow_data->drawing->width - x, // do not overlap - control_flow_data->drawing->height+SAFETY); + drawing->damage_begin+SAFETY, 0, + drawing->damage_end - drawing->damage_begin, // do not overlap + control_flow_data->drawing->height); + + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, &control_flow_data->drawing->pixmap, - x, 0, - control_flow_data->drawing->width - x, - control_flow_data->drawing->height); - - drawing_refresh(control_flow_data->drawing, - 0, 0, - control_flow_data->drawing->width, + drawing->damage_begin, 0, + drawing->damage_end - drawing->damage_begin, control_flow_data->drawing->height); - - } else { //if(nsdrawing->drawing_area->allocation.width; + guint width = control_flow_data->drawing->width; convert_time_to_pixels( *ns, new_end, *os, width, &x); - + + /* Copy old data to new location */ gdk_draw_drawable (control_flow_data->drawing->pixmap, control_flow_data->drawing->drawing_area->style->black_gc, @@ -1315,76 +1713,91 @@ gint update_time_window_hook(void *hook_data, void *call_data) x, 0, -1, -1); - *old_time_window = *new_time_window; + if(drawing->damage_begin == drawing->damage_end) + drawing->damage_end = x; + else + drawing->damage_end = + control_flow_data->drawing->width; - /* Clean the data request background */ - gdk_draw_rectangle (control_flow_data->drawing->pixmap, - control_flow_data->drawing->drawing_area->style->black_gc, - TRUE, - 0, 0, - x, // do not overlap - control_flow_data->drawing->height+SAFETY); - /* Get new data for the rest. */ - drawing_data_request(control_flow_data->drawing, - &control_flow_data->drawing->pixmap, - 0, 0, - x, - control_flow_data->drawing->height); - - drawing_refresh(control_flow_data->drawing, - 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); - - } else { - g_info("scrolling far"); - /* Cannot reuse any part of the screen : far jump */ - *old_time_window = *new_time_window; - + drawing->damage_begin = 0; gdk_draw_rectangle (control_flow_data->drawing->pixmap, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, - 0, 0, - control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height+SAFETY); + drawing->damage_begin, 0, + drawing->damage_end - drawing->damage_begin, // do not overlap + control_flow_data->drawing->height); + + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + + /* Get new data for the rest. */ drawing_data_request(control_flow_data->drawing, &control_flow_data->drawing->pixmap, - 0, 0, - control_flow_data->drawing->width, + drawing->damage_begin, 0, + drawing->damage_end - drawing->damage_begin, control_flow_data->drawing->height); - drawing_refresh(control_flow_data->drawing, + } else { + if(ltt_time_compare(*ns,*os) == 0) + { + g_info("not scrolling"); + } else { + g_info("scrolling far"); + /* Cannot reuse any part of the screen : far jump */ + + + gdk_draw_rectangle (control_flow_data->drawing->pixmap, + control_flow_data->drawing->drawing_area->style->black_gc, + TRUE, 0, 0, - control_flow_data->drawing->width, + control_flow_data->drawing->width+SAFETY, // do not overlap control_flow_data->drawing->height); + + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + + drawing->damage_begin = 0; + drawing->damage_end = control_flow_data->drawing->width; + + drawing_data_request(control_flow_data->drawing, + &control_flow_data->drawing->pixmap, + 0, 0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + + } } } } else { /* Different scale (zoom) */ g_info("zoom"); - *old_time_window = *new_time_window; - gdk_draw_rectangle (control_flow_data->drawing->pixmap, control_flow_data->drawing->drawing_area->style->black_gc, TRUE, 0, 0, control_flow_data->drawing->width+SAFETY, // do not overlap - control_flow_data->drawing->height+SAFETY); + control_flow_data->drawing->height); + gtk_widget_queue_draw_area (drawing->drawing_area, + 0,0, + control_flow_data->drawing->width, + control_flow_data->drawing->height); + drawing->damage_begin = 0; + drawing->damage_end = control_flow_data->drawing->width; + drawing_data_request(control_flow_data->drawing, &control_flow_data->drawing->pixmap, 0, 0, control_flow_data->drawing->width, control_flow_data->drawing->height); - - drawing_refresh(control_flow_data->drawing, - 0, 0, - control_flow_data->drawing->width, - control_flow_data->drawing->height); } @@ -1392,29 +1805,122 @@ gint update_time_window_hook(void *hook_data, void *call_data) return 0; } +gint traceset_notify(void *hook_data, void *call_data) +{ + ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + Drawing_t *drawing = control_flow_data->drawing; + GtkWidget *widget = drawing->drawing_area; + + drawing->damage_begin = 0; + drawing->damage_end = drawing->width; + + drawing_clear(control_flow_data->drawing); + processlist_clear(control_flow_data->process_list); + + if(drawing->damage_begin < drawing->damage_end) + { + drawing_data_request(drawing, + &drawing->pixmap, + drawing->damage_begin, + 0, + drawing->damage_end-drawing->damage_begin, + drawing->height); + } + + gtk_widget_queue_draw_area(drawing->drawing_area, + 0,0, + drawing->width, + drawing->height); + + request_background_data(control_flow_data); + + return FALSE; +} + +gint redraw_notify(void *hook_data, void *call_data) +{ + ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + Drawing_t *drawing = control_flow_data->drawing; + GtkWidget *widget = drawing->drawing_area; + + drawing->damage_begin = 0; + drawing->damage_end = drawing->width; + + + // Clear the image + gdk_draw_rectangle (drawing->pixmap, + widget->style->black_gc, + TRUE, + 0, 0, + drawing->width+SAFETY, + drawing->height); + + + if(drawing->damage_begin < drawing->damage_end) + { + drawing_data_request(drawing, + &drawing->pixmap, + drawing->damage_begin, + 0, + drawing->damage_end-drawing->damage_begin, + drawing->height); + } + + gtk_widget_queue_draw_area(drawing->drawing_area, + 0,0, + drawing->width, + drawing->height); + + return FALSE; + +} + + +gint continue_notify(void *hook_data, void *call_data) +{ + ControlFlowData *control_flow_data = (ControlFlowData*) hook_data; + Drawing_t *drawing = control_flow_data->drawing; + GtkWidget *widget = drawing->drawing_area; + + //g_assert(widget->allocation.width == drawing->damage_end); + + if(drawing->damage_begin < drawing->damage_end) + { + drawing_data_request(drawing, + &drawing->pixmap, + drawing->damage_begin, + 0, + drawing->damage_end-drawing->damage_begin, + drawing->height); + } + + return FALSE; +} + + gint update_current_time_hook(void *hook_data, void *call_data) { ControlFlowData *control_flow_data = (ControlFlowData*)hook_data; + Drawing_t *drawing = control_flow_data->drawing; - LttTime* current_time = - guicontrolflow_get_current_time(control_flow_data); - *current_time = *((LttTime*)call_data); + LttTime current_time = *((LttTime*)call_data); - TimeWindow time_window; + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); - LttTime time_begin = control_flow_data->time_window.start_time; - LttTime width = control_flow_data->time_window.time_width; + LttTime time_begin = time_window.start_time; + LttTime width = time_window.time_width; LttTime half_width = ltt_time_div(width,2.0); LttTime time_end = ltt_time_add(time_begin, width); LttvTracesetContext * tsc = - get_traceset_context(control_flow_data->mw); + lttvwindow_get_traceset_context(control_flow_data->tab); - LttTime trace_start = tsc->Time_Span->startTime; - LttTime trace_end = tsc->Time_Span->endTime; + LttTime trace_start = tsc->time_span.start_time; + LttTime trace_end = tsc->time_span.end_time; - g_info("New current time HOOK : %u, %u", current_time->tv_sec, - current_time->tv_nsec); + g_info("New current time HOOK : %u, %u", current_time.tv_sec, + current_time.tv_nsec); @@ -1428,51 +1934,65 @@ gint update_current_time_hook(void *hook_data, void *call_data) * at one end of the trace. */ - if(ltt_time_compare(*current_time, time_begin) == -1) + if(ltt_time_compare(current_time, time_begin) == -1) { - if(ltt_time_compare(*current_time, + TimeWindow new_time_window; + + if(ltt_time_compare(current_time, ltt_time_add(trace_start,half_width)) == -1) time_begin = trace_start; else - time_begin = ltt_time_sub(*current_time,half_width); + time_begin = ltt_time_sub(current_time,half_width); - time_window.start_time = time_begin; - time_window.time_width = width; + new_time_window.start_time = time_begin; + new_time_window.time_width = width; - set_time_window(control_flow_data->mw, &time_window); + lttvwindow_report_time_window(control_flow_data->tab, &new_time_window); } - else if(ltt_time_compare(*current_time, time_end) == 1) + else if(ltt_time_compare(current_time, time_end) == 1) { - if(ltt_time_compare(*current_time, ltt_time_sub(trace_end, half_width)) == 1) + TimeWindow new_time_window; + + if(ltt_time_compare(current_time, ltt_time_sub(trace_end, half_width)) == 1) time_begin = ltt_time_sub(trace_end,width); else - time_begin = ltt_time_sub(*current_time,half_width); + time_begin = ltt_time_sub(current_time,half_width); - time_window.start_time = time_begin; - time_window.time_width = width; + new_time_window.start_time = time_begin; + new_time_window.time_width = width; - set_time_window(control_flow_data->mw, &time_window); + lttvwindow_report_time_window(control_flow_data->tab, &new_time_window); } - gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); + //gtk_widget_queue_draw(control_flow_data->drawing->drawing_area); + gtk_widget_queue_draw_area(drawing->drawing_area, + 0,0, + drawing->width, + drawing->height); return 0; } typedef struct _ClosureData { - EventRequest *event_request; + EventsRequest *events_request; LttvTracesetState *tss; + LttTime end_time; } ClosureData; void draw_closure(gpointer key, gpointer value, gpointer user_data) { + + return; + + +#if 0 ProcessInfo *process_info = (ProcessInfo*)key; HashedProcessData *hashed_process_data = (HashedProcessData*)value; ClosureData *closure_data = (ClosureData*)user_data; ControlFlowData *control_flow_data = - closure_data->event_request->control_flow_data; + closure_data->events_request->viewer_data; GtkWidget *widget = control_flow_data->drawing->drawing_area; @@ -1487,26 +2007,52 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) /* Get last state of process */ LttvTraceContext *tc = ((LttvTracesetContext*)closure_data->tss)->traces[process_info->trace_num]; - //LttvTracefileContext *tfc = (LttvTracefileContext *)closure_data->ts; + LttvTracesetContext *tsc = (LttvTracesetContext *)closure_data->tss; LttvTraceState *ts = (LttvTraceState*)tc; LttvProcessState *process; - process = lttv_state_find_process_from_trace(ts, process_info->pid); + /* We do not provide a cpu_name argument assuming that this is not the + idle job (pid 0) and thus its pid is unique across all cpus */ + process = lttv_state_find_process_from_trace(ts, 0, process_info->pid); /* Draw the closing line */ DrawContext *draw_context = hashed_process_data->draw_context; if(draw_context->previous->middle->x == -1) { - draw_context->previous->middle->x = closure_data->event_request->x_begin; - draw_context->previous->over->x = closure_data->event_request->x_begin; - draw_context->previous->under->x = closure_data->event_request->x_begin; - g_critical("out middle x_beg : %u",closure_data->event_request->x_begin); + draw_context->previous->over->x = + control_flow_data->drawing->damage_begin; + draw_context->previous->middle->x = + control_flow_data->drawing->damage_begin; + draw_context->previous->under->x = + control_flow_data->drawing->damage_begin; + + g_debug("out middle x_beg : %u",control_flow_data->drawing->damage_begin); } - draw_context->current->middle->x = closure_data->event_request->x_end; - draw_context->current->over->x = closure_data->event_request->x_end; - draw_context->current->under->x = closure_data->event_request->x_end; + /* Find pixels corresponding to current time . 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; + + TimeWindow time_window = + lttvwindow_get_time_window(control_flow_data->tab); + + LttTime time = lttv_traceset_context_get_current_tfc(tsc)->timestamp; + + LttTime window_end = ltt_time_add(time_window.time_width, + time_window.start_time); + + convert_time_to_pixels( + time_window.start_time, + window_end, + time, + width, + &x); + + draw_context->current->middle->x = x; + draw_context->current->over->x = x; + draw_context->current->under->x = x; draw_context->current->middle->y = y + height/2; draw_context->current->over->y = y ; draw_context->current->under->y = y + height; @@ -1516,10 +2062,11 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) draw_context->drawable = control_flow_data->drawing->pixmap; draw_context->pango_layout = control_flow_data->drawing->pango_layout; //draw_context->gc = widget->style->black_gc; - draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap); - gdk_gc_copy(draw_context->gc, widget->style->black_gc); + //draw_context->gc = gdk_gc_new(control_flow_data->drawing->pixmap); + //gdk_gc_copy(draw_context->gc, widget->style->black_gc); + draw_context->gc = control_flow_data->drawing->gc; - if(process->state->s == LTTV_STATE_RUN) + if(process != NULL && process->state->s == LTTV_STATE_RUN) { PropertiesBG prop_bg; prop_bg.color = g_new(GdkColor,1); @@ -1552,7 +2099,7 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) } */ - g_critical("calling from closure"); + g_debug("calling from closure"); //FIXME : I need the cpu number in process's state to draw this. //draw_bg((void*)&prop_bg, (void*)draw_context); g_free(prop_bg.color); @@ -1566,52 +2113,62 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) prop_line.position = MIDDLE; /* color of line : status of the process */ - if(process->state->s == LTTV_STATE_UNNAMED) + if(process != NULL) { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xffff; - } - else if(process->state->s == LTTV_STATE_WAIT_FORK) - { - prop_line.color->red = 0x0fff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xfff0; - } - else if(process->state->s == LTTV_STATE_WAIT_CPU) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0x0000; - } - else if(process->state->s == LTTV_STATE_EXIT) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0xffff; - } - else if(process->state->s == LTTV_STATE_WAIT) - { - prop_line.color->red = 0xffff; - prop_line.color->green = 0x0000; - prop_line.color->blue = 0x0000; - } - else if(process->state->s == LTTV_STATE_RUN) - { - prop_line.color->red = 0x0000; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0x0000; + if(process->state->s == LTTV_STATE_UNNAMED) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; + } + else if(process->state->s == LTTV_STATE_WAIT_FORK) + { + prop_line.color->red = 0x0fff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xfff0; + } + else if(process->state->s == LTTV_STATE_WAIT_CPU) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0x0000; + } + else if(process->state->s == LTTV_STATE_EXIT) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0x0000; + prop_line.color->blue = 0xffff; + } + else if(process->state->s == LTTV_STATE_WAIT) + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0x0000; + prop_line.color->blue = 0x0000; + } + else if(process->state->s == LTTV_STATE_RUN) + { + prop_line.color->red = 0x0000; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0x0000; + } + else + { + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; + } + } else { - prop_line.color->red = 0xffff; - prop_line.color->green = 0xffff; - prop_line.color->blue = 0xffff; + prop_line.color->red = 0xffff; + prop_line.color->green = 0xffff; + prop_line.color->blue = 0xffff; } draw_line((void*)&prop_line, (void*)draw_context); g_free(prop_line.color); - gdk_gc_unref(draw_context->gc); + //gdk_gc_unref(draw_context->gc); /* Reset draw_context of the process for next request */ @@ -1644,29 +2201,100 @@ void draw_closure(gpointer key, gpointer value, gpointer user_data) hashed_process_data->draw_context->previous->modify_under->x = -1; hashed_process_data->draw_context->previous->modify_under->y = -1; hashed_process_data->draw_context->previous->status = LTTV_STATE_UNNAMED; - +#endif //0 +} + +int before_chunk(void *hook_data, void *call_data) +{ + EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + + drawing_chunk_begin(events_request, tss); + + return 0; } +int before_request(void *hook_data, void *call_data) +{ + EventsRequest *events_request = (EventsRequest*)hook_data; + LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + + drawing_data_request_begin(events_request, tss); + + return 0; +} + + /* + * after request is necessary in addition of after chunk in order to draw + * lines until the end of the screen. after chunk just draws lines until + * the last event. + * * for each process * draw closing line - * new default prev and current + * expose */ -int after_data_request(void *hook_data, void *call_data) +int after_request(void *hook_data, void *call_data) { - EventRequest *event_request = (EventRequest*)hook_data; - ControlFlowData *control_flow_data = event_request->control_flow_data; + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; + LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); ProcessList *process_list = - guicontrolflow_get_process_list(event_request->control_flow_data); + guicontrolflow_get_process_list(control_flow_data); + LttTime end_time = events_request->end_time; ClosureData closure_data; - closure_data.event_request = (EventRequest*)hook_data; - closure_data.tss = (LttvTracesetState*)call_data; + closure_data.events_request = (EventsRequest*)hook_data; + closure_data.tss = tss; + closure_data.end_time = end_time; + /* Draw last items */ g_hash_table_foreach(process_list->process_hash, draw_closure, (void*)&closure_data); + + /* Request expose */ + drawing_request_expose(events_request, tss, end_time); + return 0; +} + +/* + * for each process + * draw closing line + * expose + */ +int after_chunk(void *hook_data, void *call_data) +{ + EventsRequest *events_request = (EventsRequest*)hook_data; + ControlFlowData *control_flow_data = events_request->viewer_data; + LttvTracesetState *tss = LTTV_TRACESET_STATE(call_data); + LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(call_data); + LttvTracefileContext *tfc = lttv_traceset_context_get_current_tfc(tsc); + LttTime end_time; + + ProcessList *process_list = + guicontrolflow_get_process_list(control_flow_data); + + if(tfc != NULL + && ltt_time_compare(tfc->timestamp, events_request->end_time) <= 0) + end_time = tfc->timestamp; + else /* end of traceset, or position now out of request : end */ + end_time = events_request->end_time; + ClosureData closure_data; + closure_data.events_request = (EventsRequest*)hook_data; + closure_data.tss = tss; + closure_data.end_time = end_time; + + /* Draw last items */ + g_hash_table_foreach(process_list->process_hash, draw_closure, + (void*)&closure_data); + + /* Request expose */ + drawing_request_expose(events_request, tss, end_time); + + return 0; }