#include <lttv/hook.h>
#include <lttv/state.h>
#include <lttvwindow/lttvwindow.h>
+#include <lttvwindow/lttvwindowtraces.h>
#include "eventhooks.h"
#define MAX_PATH_LEN 256
+/* Action to do when background computation completed.
+ *
+ * Eventually, will have to check that every requested traces are finished
+ * before doing the redraw.
+ */
+
+gint background_ready(void *hook_data, void *call_data)
+{
+ ControlFlowData *control_flow_data = (ControlFlowData *)hook_data;
+ LttvTrace *trace = (LttvTrace*)call_data;
+
+ g_debug("control flow viewer : background computation data ready.");
+
+ 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;i<num_traces;i++) {
+ trace = lttvwindowtraces_get_trace(i);
+
+ if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) {
+
+ if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"),
+ trace) == FALSE) {
+ /* We first remove requests that could have been done for the same
+ * information. Happens when two viewers ask for it before servicing
+ * starts.
+ */
+ lttvwindowtraces_background_request_remove(trace, "state");
+ lttvwindowtraces_background_request_queue(trace,
+ "state");
+ lttvwindowtraces_background_notify_queue(control_flow_data,
+ trace,
+ ltt_time_infinite,
+ NULL,
+ background_ready_hook);
+ } else { /* in progress */
+
+ lttvwindowtraces_background_notify_current(control_flow_data,
+ trace,
+ ltt_time_infinite,
+ NULL,
+ background_ready_hook);
+
+ }
+ }
+ }
+
+ lttv_hooks_destroy(background_ready_hook);
+}
+
+
+
+
/**
* Event Viewer's constructor hook
*
* This constructor is given as a parameter to the menuitem and toolbar button
* registration. It creates the list.
- * @param mw A pointer to the parent window.
+ * @param tab A pointer to the parent tab.
* @return The widget created.
*/
GtkWidget *
-h_guicontrolflow(MainWindow *mw, LttvTracesetSelector * s, char * key)
+h_guicontrolflow(Tab *tab, LttvTracesetSelector * s, char * key)
{
- g_info("h_guicontrolflow, %p, %p, %s", mw, s, key);
+ g_info("h_guicontrolflow, %p, %p, %s", tab, s, key);
ControlFlowData *control_flow_data = guicontrolflow() ;
- control_flow_data->mw = mw;
+ control_flow_data->tab = tab;
//g_debug("time width2 : %u",time_window->time_width);
// Unreg done in the GuiControlFlow_Destructor
- lttvwindow_register_time_window_notify(mw,
+ 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(mw,
+ 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);
+
+
return guicontrolflow_get_widget(control_flow_data) ;
}
*/
int draw_before_hook(void *hook_data, void *call_data)
{
- EventRequest *event_request = (EventRequest*)hook_data;
+ EventsRequest *events_request = (EventsRequest*)hook_data;
//EventsContext Events_Context = (EventsContext*)call_data;
//event_request->Events_Context = Events_Context;
*/
int draw_event_hook(void *hook_data, void *call_data)
{
- EventRequest *event_request = (EventRequest*)hook_data;
- ControlFlowData *control_flow_data = event_request->control_flow_data;
- MainWindow *mw = control_flow_data->mw;
+ 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;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- const TimeWindow *time_window =
- lttvwindow_get_time_window(mw);
+ 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;
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);
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,
&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_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,
&height,
&hashed_process_data_in) == 1)
{
- /* Process not present */
+ /* Process not present */
processlist_add(process_list,
pid_in,
&birth,
&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(time_window->time_width,
- time_window->start_time);
+ LttTime window_end = ltt_time_add(time_window.time_width,
+ time_window.start_time);
convert_time_to_pixels(
- 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;
/* 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_debug("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;
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);
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;
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);
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. */
/* 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_debug("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;
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);
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;
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);
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;
- /* Temp dump */
+ /* Text dump */
#ifdef DONTSHOW
GString *string = g_string_new("");;
gboolean field_names = TRUE, state = TRUE;
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;
e = tfc->e;
LttTime evtime = ltt_event_time(e);
- const TimeWindow *time_window =
- lttvwindow_get_time_window(control_flow_data->mw);
+ 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;
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);
&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);
&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_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,
control_flow_data->drawing->pixmap,
x, 0,
0, 0,
- -1, -1);
-
+ 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;
+
/* 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 - x,
+ 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,
+ drawing->damage_begin, 0,
+ drawing->damage_end - drawing->damage_begin,
control_flow_data->drawing->height);
-
} else {
//if(ns<os<ns+w)
//if(ns<os && os<ns+w)
g_info("scrolling near left");
/* Scroll left, keep left 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(
*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,
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 */
+ drawing->damage_begin = 0;
+
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);
+ 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,
- x,0,
- control_flow_data->drawing->width - x,
+ 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,
- x,
+ drawing->damage_begin, 0,
+ drawing->damage_end - drawing->damage_begin,
control_flow_data->drawing->height);
} else {
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,
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);
-
}
return 0;
}
-gint after_process_traceset_hook(void *hook_data, void *call_data)
+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;
+
+
+ // 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);
+
+ 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;
- TimeRequest *time_request = (TimeRequest *)call_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;
+}
- drawing_data_request_end(control_flow_data->drawing,
- time_request->time_window);
+
+gint after_process_traceset_hook(void *hook_data, void *call_data)
+{
+ //ControlFlowData *control_flow_data = (ControlFlowData*) hook_data;
+ EventsRequest *events_request = (EventsRequest *)hook_data;
+
+ ControlFlowData *control_flow_data =
+ (ControlFlowData*)events_request->viewer_data;
+
+
+ drawing_data_request_end(events_request,
+ (LttvTracesetState*)call_data);
return 0;
}
LttTime current_time = *((LttTime*)call_data);
- const TimeWindow *time_window =
- lttvwindow_get_time_window(control_flow_data->mw);
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
- LttTime time_begin = time_window->start_time;
- LttTime width = 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 =
- lttvwindow_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);
new_time_window.start_time = time_begin;
new_time_window.time_width = width;
- lttvwindow_report_time_window(control_flow_data->mw, &new_time_window);
+ lttvwindow_report_time_window(control_flow_data->tab, &new_time_window);
}
else if(ltt_time_compare(current_time, time_end) == 1)
{
new_time_window.start_time = time_begin;
new_time_window.time_width = width;
- lttvwindow_report_time_window(control_flow_data->mw, &new_time_window);
+ lttvwindow_report_time_window(control_flow_data->tab, &new_time_window);
}
//gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
}
typedef struct _ClosureData {
- EventRequest *event_request;
+ EventsRequest *events_request;
LttvTracesetState *tss;
} ClosureData;
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;
/* 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;
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_debug("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;
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 != NULL && process->state->s == LTTV_STATE_RUN)
{
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 */
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;
-
}
+int before_data_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;
+}
+
+
/*
* for each process
* draw closing line
*/
int after_data_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);
ProcessList *process_list =
- guicontrolflow_get_process_list(event_request->control_flow_data);
+ guicontrolflow_get_process_list(control_flow_data);
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;
g_hash_table_foreach(process_list->process_hash, draw_closure,
(void*)&closure_data);
- /* Remove reading hooks */
- // Cannot do this here, will break processtrace!
- //drawing_data_request_end(control_flow_data->drawing);
-
+ /* Request expose */
+ drawing_data_request_end(events_request, tss);
+
+ return 0;
}
projects / lttv.git / blobdiff