#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 = 5;
+ prop_line.line_width = STATE_LINE_WIDTH;
prop_line.style = GDK_LINE_SOLID;
prop_line.y = MIDDLE;
//GdkColormap *colormap = gdk_colormap_get_system();
tfc->target_pid = pid_out;
if(!filter || !filter->head ||
lttv_filter_tree_parse(filter->head,e,tfc->tf,
- tfc->t_context->t,tfc)) {
+ 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
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)) {
+ 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
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 */
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
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 */
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
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 */
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
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 */
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
guint cpu = tfs->cpu;
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
guint cpu = tfs->cpu;
LttvTraceState *ts = (LttvTraceState *)tfc->t_context;
+ guint first_cpu, nb_cpus, cpu;
+
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))
+ tfc->t_context->t,tfc,NULL,NULL))
return FALSE;
LttTime evtime = ltt_event_time(e);
{
pid_in = ltt_event_get_long_unsigned(e, thf->f1);
}
+
+ if(pid_in == 0) {
+ first_cpu = 0;
+ nb_cpus = ltt_trace_get_num_cpu(ts->parent.t);
+ } else {
+ first_cpu = ANY_CPU;
+ nb_cpus = ANY_CPU+1;
+ }
-
- /* Find process pid_in in the list... */
- 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
- //g_assert(process_in != NULL);
-#endif //EXTRA_CHECK
- birth = process_in->creation_time;
-
- hashed_process_data_in = processlist_get_process_data(process_list,
+ for(cpu = first_cpu; cpu < nb_cpus; cpu++) {
+ /* Find process pid_in in the list... */
+ process_in = lttv_state_find_process(ts, 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
+ //g_assert(process_in != NULL);
+ #endif //EXTRA_CHECK
+ birth = process_in->creation_time;
+
+ hashed_process_data_in = processlist_get_process_data(process_list,
+ pid_in,
+ process_in->cpu,
+ &birth,
+ trace_num);
+ if(hashed_process_data_in == NULL)
+ {
+ if(pid_in != 0 && pid_in == process_in->ppid)
+ g_critical("TEST %u , %u", pid_in, process_in->ppid);
+ g_assert(pid_in == 0 || pid_in != process_in->ppid);
+ ProcessInfo *process_info;
+ Drawing_t *drawing = control_flow_data->drawing;
+ /* Process not present */
+ processlist_add(process_list,
+ drawing,
pid_in,
+ process_in->tgid,
process_in->cpu,
+ process_in->ppid,
&birth,
- trace_num);
- if(hashed_process_data_in == NULL)
- {
- if(pid_in != 0 && pid_in == process_in->ppid)
- g_critical("TEST %u , %u", pid_in, process_in->ppid);
- g_assert(pid_in == 0 || pid_in != process_in->ppid);
- ProcessInfo *process_info;
- Drawing_t *drawing = control_flow_data->drawing;
- /* Process not present */
- processlist_add(process_list,
- drawing,
- pid_in,
- process_in->tgid,
- process_in->cpu,
- process_in->ppid,
- &birth,
- trace_num,
- process_in->name,
- process_in->brand,
- &pl_height,
- &process_info,
- &hashed_process_data_in);
- gtk_widget_set_size_request(drawing->drawing_area,
- -1,
- pl_height);
- gtk_widget_queue_draw(drawing->drawing_area);
- } else {
- processlist_set_name(process_list, process_in->name,
- hashed_process_data_in);
- processlist_set_ppid(process_list, process_in->ppid,
- hashed_process_data_in);
- processlist_set_tgid(process_list, process_in->tgid,
- hashed_process_data_in);
- }
+ trace_num,
+ process_in->name,
+ process_in->brand,
+ &pl_height,
+ &process_info,
+ &hashed_process_data_in);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ } else {
+ processlist_set_name(process_list, process_in->name,
+ hashed_process_data_in);
+ processlist_set_ppid(process_list, process_in->ppid,
+ hashed_process_data_in);
+ processlist_set_tgid(process_list, process_in->tgid,
+ hashed_process_data_in);
+ }
+ }
return 0;
}
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)) {
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