#define MAX_PATH_LEN 256
+#define STATE_LINE_WIDTH 4
+#define COLLISION_POSITION(height) (((height - STATE_LINE_WIDTH)/2) -3)
extern GSList *g_legend_list;
gint num_traces = lttv_traceset_number(tsc->ts);
gint i;
LttvTrace *trace;
+ LttvTraceState *tstate;
LttvHooks *background_ready_hook =
lttv_hooks_new();
for(i=0;i<num_traces;i++) {
trace = lttv_traceset_get(tsc->ts, i);
+ tstate = LTTV_TRACE_STATE(tsc->traces[i]);
- if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE) {
+ if(lttvwindowtraces_get_ready(g_quark_from_string("state"),trace)==FALSE
+ && !tstate->has_precomputed_states) {
if(lttvwindowtraces_get_in_progress(g_quark_from_string("state"),
trace) == FALSE) {
control_flow_data->background_info_waiting++;
}
} else {
- /* Data ready. Be its nature, this viewer doesn't need to have
+ /* Data ready. By its nature, this viewer doesn't need to have
* its data ready hook called there, because a background
* request is always linked with a redraw.
*/
static inline PropertiesLine prepare_s_e_line(LttvProcessState *process)
{
PropertiesLine prop_line;
- prop_line.line_width = 2;
+ prop_line.line_width = STATE_LINE_WIDTH;
prop_line.style = GDK_LINE_SOLID;
prop_line.y = MIDDLE;
//GdkColormap *colormap = gdk_colormap_get_system();
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ gint target_pid_saved = tfc->target_pid;
LttTime evtime = ltt_event_time(e);
+ LttvFilter *filter = control_flow_data->filter;
/* 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
pid_in = ltt_event_get_long_unsigned(e, thf->f2);
}
- {
+ tfc->target_pid = pid_out;
+ if(!filter || !filter->head ||
+ lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL)) {
/* For the pid_out */
/* First, check if the current process is in the state computation
* process list. If it is there, that means we must add it right now and
* present, it's a new process and it was not present : it will
* be added after the state update. */
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
LttvProcessState *process = ts->running_process[cpu];
/* unknown state, bad current pid */
if(process->pid != pid_out)
pid_out,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(hashed_process_data == NULL)
{
g_assert(pid_out == 0 || pid_out != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
} else {
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
}
}
- {
+ tfc->target_pid = pid_in;
+ if(!filter || !filter->head ||
+ lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL)) {
/* For the pid_in */
/* First, check if the current process is in the state computation
* process list. If it is there, that means we must add it right now and
LttvProcessState *process;
process = lttv_state_find_process(ts,
tfs->cpu, pid_in);
+ guint trace_num = ts->parent.index;
if(process != NULL) {
/* Well, the process existed : we must get it in the process hash
pid_in,
tfs->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(hashed_process_data == NULL)
{
g_assert(pid_in == 0 || pid_in != process->ppid);
tfs->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
} else {
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
} else
g_warning("Cannot find pin_in in schedchange %u", pid_in);
}
+ tfc->target_pid = target_pid_saved;
return 0;
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
/* Add process to process list (if not present) */
//process_in = lttv_state_find_process(ts, ANY_CPU, pid_in);
//process_in = tfs->process;
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
process_in = ts->running_process[cpu];
/* It should exist, because we are after the state update. */
#ifdef EXTRA_CHECK
pid_in,
process_in->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(hashed_process_data_in == NULL)
{
g_assert(pid_in == 0 || pid_in != process_in->ppid);
process_in->cpu,
process_in->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process_in->name,
process_in->brand,
&pl_height,
gtk_widget_queue_draw(drawing->drawing_area);
}
/* Set the current process */
- process_list->current_hash_data[process_in->cpu] =
+ process_list->current_hash_data[trace_num][process_in->cpu] =
hashed_process_data_in;
if(ltt_time_compare(hashed_process_data_in->next_good_time,
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
/* we are in a execmode, before the state update. We must draw the
/* For the pid */
//LttvProcessState *process = tfs->process;
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
LttvProcessState *process = ts->running_process[cpu];
g_assert(process != NULL);
ProcessList *process_list = control_flow_data->process_list;
LttTime birth = process->creation_time;
- if(likely(process_list->current_hash_data[cpu] != NULL)) {
- hashed_process_data = process_list->current_hash_data[cpu];
+ if(likely(process_list->current_hash_data[trace_num][cpu] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[trace_num][cpu];
} else {
hashed_process_data = processlist_get_process_data(process_list,
pid,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(unlikely(hashed_process_data == NULL))
{
g_assert(pid == 0 || pid != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gtk_widget_queue_draw(drawing->drawing_area);
}
/* Set the current process */
- process_list->current_hash_data[process->cpu] =
+ process_list->current_hash_data[trace_num][process->cpu] =
hashed_process_data;
}
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
} else {
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
/* Add process to process list (if not present) */
//LttvProcessState *process = tfs->process;
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
LttvProcessState *process = ts->running_process[cpu];
guint pid = process->pid;
LttTime birth;
birth = process->creation_time;
- if(likely(process_list->current_hash_data[cpu] != NULL)) {
- hashed_process_data = process_list->current_hash_data[cpu];
+ if(likely(process_list->current_hash_data[trace_num][cpu] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[trace_num][cpu];
} else {
hashed_process_data = processlist_get_process_data(process_list,
pid,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(unlikely(hashed_process_data == NULL))
{
g_assert(pid == 0 || pid != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
} else {
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
+ guint trace_num = ts->parent.index;
guint pid;
{
pid,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(unlikely(hashed_process_data == NULL))
{
g_assert(pid == 0 || pid != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
} else {
gdk_draw_point(hashed_process_data->pixmap,
drawing->gc,
x,
- (hashed_process_data->height/2)-3);
+ COLLISION_POSITION(hashed_process_data->height));
hashed_process_data->x.middle_marked = TRUE;
}
/* jump */
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
guint child_pid;
g_assert(process_child != NULL);
birth = process_child->creation_time;
+ guint trace_num = ts->parent.index;
/* Cannot use current process, because this action is done by the parent
* on its child. */
child_pid,
process_child->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(likely(hashed_process_data_child == NULL))
{
g_assert(child_pid == 0 || child_pid != process_child->ppid);
process_child->cpu,
process_child->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process_child->name,
process_child->brand,
&pl_height,
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
/* Add process to process list (if not present) */
//LttvProcessState *process = tfs->process;
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
LttvProcessState *process = ts->running_process[cpu];
/* It should exist, because we are after the state update. */
birth = process->creation_time;
- if(likely(process_list->current_hash_data[cpu] != NULL) ){
- hashed_process_data = process_list->current_hash_data[cpu];
+ if(likely(process_list->current_hash_data[trace_num][cpu] != NULL) ){
+ hashed_process_data = process_list->current_hash_data[trace_num][cpu];
} else {
hashed_process_data = processlist_get_process_data(process_list,
pid,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(unlikely(hashed_process_data == NULL))
{
g_assert(pid == 0 || pid != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
}
/* Set the current process */
- process_list->current_hash_data[process->cpu] =
+ process_list->current_hash_data[trace_num][process->cpu] =
hashed_process_data;
}
LttvTraceState *ts = (LttvTraceState *)tfc->t_context;
+ LttEvent *e;
+ e = ltt_tracefile_get_event(tfc->tf);
+
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
LttvProcessState *process = ts->running_process[cpu];
g_assert(process != NULL);
ProcessList *process_list = control_flow_data->process_list;
LttTime birth = process->creation_time;
- if(likely(process_list->current_hash_data[cpu] != NULL)) {
- hashed_process_data = process_list->current_hash_data[cpu];
+ if(likely(process_list->current_hash_data[trace_num][cpu] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[trace_num][cpu];
} else {
hashed_process_data = processlist_get_process_data(process_list,
pid,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(unlikely(hashed_process_data == NULL))
{
g_assert(pid == 0 || pid != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gtk_widget_queue_draw(drawing->drawing_area);
}
/* Set the current process */
- process_list->current_hash_data[process->cpu] =
+ process_list->current_hash_data[trace_num][process->cpu] =
hashed_process_data;
}
LttvTraceState *ts = (LttvTraceState *)tfc->t_context;
+ LttEvent *e;
+ e = ltt_tracefile_get_event(tfc->tf);
+
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
guint cpu = tfs->cpu;
+ guint trace_num = ts->parent.index;
LttvProcessState *process = ts->running_process[cpu];
g_assert(process != NULL);
ProcessList *process_list = control_flow_data->process_list;
LttTime birth = process->creation_time;
- if(likely(process_list->current_hash_data[cpu] != NULL)) {
- hashed_process_data = process_list->current_hash_data[cpu];
+ if(likely(process_list->current_hash_data[trace_num][cpu] != NULL)) {
+ hashed_process_data = process_list->current_hash_data[trace_num][cpu];
} else {
hashed_process_data = processlist_get_process_data(process_list,
pid,
process->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(unlikely(hashed_process_data == NULL))
{
g_assert(pid == 0 || pid != process->ppid);
process->cpu,
process->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process->name,
process->brand,
&pl_height,
gtk_widget_queue_draw(drawing->drawing_area);
}
/* Set the current process */
- process_list->current_hash_data[process->cpu] =
+ process_list->current_hash_data[trace_num][process->cpu] =
hashed_process_data;
}
LttEvent *e;
e = ltt_tracefile_get_event(tfc->tf);
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
LttTime evtime = ltt_event_time(e);
/* Add process to process list (if not present) */
HashedProcessData *hashed_process_data_in = NULL;
ProcessList *process_list = control_flow_data->process_list;
+ guint trace_num = ts->parent.index;
guint pid_in;
{
process_in = lttv_state_find_process(ts, ANY_CPU, pid_in);
//process_in = tfs->process;
//guint cpu = tfs->cpu;
+ //guint trace_num = ts->parent.index;
//process_in = ts->running_process[cpu];
/* It should exist, because we are after the state update. */
#ifdef EXTRA_CHECK
pid_in,
process_in->cpu,
&birth,
- tfc->t_context->index);
+ trace_num);
if(hashed_process_data_in == NULL)
{
if(pid_in != 0 && pid_in == process_in->ppid)
process_in->cpu,
process_in->ppid,
&birth,
- tfc->t_context->index,
+ trace_num,
process_in->name,
process_in->brand,
&pl_height,
LttTime evtime = closure_data->end_time;
+ gboolean dodraw = TRUE;
+
{
/* For the process */
/* First, check if the current process is in the state computation
if(unlikely(process != NULL)) {
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,NULL,NULL,
+ tc->t,NULL,process,tc))
+ dodraw = FALSE;
+
/* Only draw for processes that are currently in the trace states */
ProcessList *process_list = control_flow_data->process_list;
} else {
draw_context.drawinfo.start.x = hashed_process_data->x.middle;
/* Draw the line */
- PropertiesLine prop_line = prepare_s_e_line(process);
- draw_line((void*)&prop_line, (void*)&draw_context);
+ if(dodraw) {
+ PropertiesLine prop_line = prepare_s_e_line(process);
+ draw_line((void*)&prop_line, (void*)&draw_context);
+ }
/* become the last x position */
if(likely(x != hashed_process_data->x.middle)) {
LttTime end_time;
ProcessList *process_list = control_flow_data->process_list;
+ guint i;
+ LttvTraceset *traceset = tsc->ts;
+ guint nb_trace = lttv_traceset_number(traceset);
+
+ /* Only execute when called for the first trace's events request */
+ if(!process_list->current_hash_data) return;
+ for(i = 0 ; i < nb_trace ; i++) {
+ g_free(process_list->current_hash_data[i]);
+ }
g_free(process_list->current_hash_data);
process_list->current_hash_data = NULL;
-
+
if(tfc != NULL)
end_time = LTT_TIME_MIN(tfc->timestamp, events_request->end_time);
else /* end of traceset, or position now out of request : end */
return 0;
}
+/* after_statedump_end
+ *
+ * @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_statedump_end(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;
+
+ LttvTracesetState *tss = (LttvTracesetState*)tfc->t_context->ts_context;
+ ProcessList *process_list = control_flow_data->process_list;
+
+ LttEvent *e;
+ e = ltt_tracefile_get_event(tfc->tf);
+
+ LttvFilter *filter = control_flow_data->filter;
+ if(filter != NULL && filter->head != NULL)
+ if(!lttv_filter_tree_parse(filter->head,e,tfc->tf,
+ tfc->t_context->t,tfc,NULL,NULL))
+ return FALSE;
+
+ LttTime evtime = ltt_event_time(e);
+
+ ClosureData closure_data;
+ closure_data.events_request = events_request;
+ closure_data.tss = tss;
+ closure_data.end_time = evtime;
+
+ TimeWindow time_window =
+ lttvwindow_get_time_window(control_flow_data->tab);
+ guint width = control_flow_data->drawing->width;
+ convert_time_to_pixels(
+ time_window,
+ evtime,
+ width,
+ &closure_data.x_end);
+
+ /* Draw last items */
+ g_hash_table_foreach(process_list->process_hash, draw_closure,
+ (void*)&closure_data);
+#if 0
+ /* Reactivate sort */
+ gtk_tree_sortable_set_sort_column_id(
+ GTK_TREE_SORTABLE(control_flow_data->process_list->list_store),
+ GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID,
+ GTK_SORT_ASCENDING);
+
+ update_index_to_pixmap(control_flow_data->process_list);
+ /* Request a full expose : drawing scrambled */
+ gtk_widget_queue_draw(control_flow_data->drawing->drawing_area);
+#endif //0
+ /* Request expose (updates damages zone also) */
+ drawing_request_expose(events_request, tss, evtime);
+
+ return 0;
+}
projects / lttv.git / blobdiff