* 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. */
- guint cpu = ltt_tracefile_num(tfc->tf);
+ guint cpu = tfs->cpu;
LttvProcessState *process = ts->running_process[cpu];
/* unknown state, bad current pid */
if(process->pid != pid_out)
process = lttv_state_find_process(ts,
- ltt_tracefile_num(tfc->tf), pid_out);
+ tfs->cpu, pid_out);
if(process != NULL) {
/* Well, the process_out existed : we must get it in the process hash
processlist_add(process_list,
drawing,
pid_out,
+ process->tgid,
process->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
* be added after the state update. */
LttvProcessState *process;
process = lttv_state_find_process(ts,
- ltt_tracefile_num(tfc->tf), pid_in);
+ tfs->cpu, pid_in);
if(process != NULL) {
/* Well, the process existed : we must get it in the process hash
hashed_process_data = processlist_get_process_data(process_list,
pid_in,
- ltt_tracefile_num(tfc->tf),
+ tfs->cpu,
&birth,
tfc->t_context->index);
if(hashed_process_data == NULL)
processlist_add(process_list,
drawing,
pid_in,
- ltt_tracefile_num(tfc->tf),
+ process->tgid,
+ tfs->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
/* Find process pid_in in the list... */
//process_in = lttv_state_find_process(ts, ANY_CPU, pid_in);
//process_in = tfs->process;
- guint cpu = ltt_tracefile_num(tfc->tf);
+ guint cpu = tfs->cpu;
process_in = ts->running_process[cpu];
/* It should exist, because we are after the state update. */
#ifdef EXTRA_CHECK
processlist_add(process_list,
drawing,
pid_in,
+ process_in->tgid,
process_in->cpu,
process_in->ppid,
&birth,
tfc->t_context->index,
process_in->name,
+ process_in->brand,
&pl_height,
&process_info,
&hashed_process_data_in);
*/
/* For the pid */
//LttvProcessState *process = tfs->process;
- guint cpu = ltt_tracefile_num(tfc->tf);
+ guint cpu = tfs->cpu;
LttvProcessState *process = ts->running_process[cpu];
g_assert(process != NULL);
processlist_add(process_list,
drawing,
pid,
+ process->tgid,
process->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
/* Add process to process list (if not present) */
//LttvProcessState *process = tfs->process;
- guint cpu = ltt_tracefile_num(tfc->tf);
+ guint cpu = tfs->cpu;
LttvProcessState *process = ts->running_process[cpu];
guint pid = process->pid;
LttTime birth;
processlist_add(process_list,
drawing,
pid,
+ process->tgid,
process->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
processlist_add(process_list,
drawing,
pid,
+ process->tgid,
process->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
processlist_add(process_list,
drawing,
child_pid,
+ process_child->tgid,
process_child->cpu,
process_child->ppid,
&birth,
tfc->t_context->index,
process_child->name,
+ process_child->brand,
&pl_height,
&process_info,
&hashed_process_data_child);
-1,
pl_height);
gtk_widget_queue_draw(drawing->drawing_area);
+ } else {
+ processlist_set_ppid(process_list, process_child->ppid,
+ hashed_process_data_child);
+ processlist_set_tgid(process_list, process_child->tgid,
+ hashed_process_data_child);
}
/* Add process to process list (if not present) */
//LttvProcessState *process = tfs->process;
- guint cpu = ltt_tracefile_num(tfc->tf);
+ guint cpu = tfs->cpu;
LttvProcessState *process = ts->running_process[cpu];
/* It should exist, because we are after the state update. */
processlist_add(process_list,
drawing,
pid,
+ process->tgid,
process->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
LttvTraceState *ts = (LttvTraceState *)tfc->t_context;
- guint cpu = ltt_tracefile_num(tfc->tf);
+ guint cpu = tfs->cpu;
LttvProcessState *process = ts->running_process[cpu];
g_assert(process != NULL);
processlist_add(process_list,
drawing,
pid,
+ process->tgid,
process->cpu,
process->ppid,
&birth,
tfc->t_context->index,
process->name,
+ process->brand,
&pl_height,
&process_info,
&hashed_process_data);
}
+/* Get the filename of the process to print */
+int after_user_generic_thread_brand_hook(void *hook_data, void *call_data)
+{
+ LttvTraceHookByFacility *thf = (LttvTraceHookByFacility*)hook_data;
+ EventsRequest *events_request = (EventsRequest*)thf->hook_data;
+ ControlFlowData *control_flow_data = events_request->viewer_data;
+
+ LttvTracefileContext *tfc = (LttvTracefileContext *)call_data;
+
+ LttvTracefileState *tfs = (LttvTracefileState *)call_data;
+
+ LttvTraceState *ts = (LttvTraceState *)tfc->t_context;
+
+ guint cpu = tfs->cpu;
+ LttvProcessState *process = ts->running_process[cpu];
+ g_assert(process != NULL);
+
+ guint pid = process->pid;
+
+ /* 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 pl_height = 0;
+ HashedProcessData *hashed_process_data = 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];
+ } else {
+ hashed_process_data = processlist_get_process_data(process_list,
+ pid,
+ process->cpu,
+ &birth,
+ tfc->t_context->index);
+ if(unlikely(hashed_process_data == NULL))
+ {
+ g_assert(pid == 0 || pid != process->ppid);
+ ProcessInfo *process_info;
+ /* Process not present */
+ Drawing_t *drawing = control_flow_data->drawing;
+ processlist_add(process_list,
+ drawing,
+ pid,
+ process->tgid,
+ process->cpu,
+ process->ppid,
+ &birth,
+ tfc->t_context->index,
+ process->name,
+ process->brand,
+ &pl_height,
+ &process_info,
+ &hashed_process_data);
+ gtk_widget_set_size_request(drawing->drawing_area,
+ -1,
+ pl_height);
+ gtk_widget_queue_draw(drawing->drawing_area);
+ }
+ /* Set the current process */
+ process_list->current_hash_data[process->cpu] =
+ hashed_process_data;
+ }
+
+ processlist_set_brand(process_list, process->brand, hashed_process_data);
+
+ return 0;
+
+}
+
+
/* after_event_enum_process_hook
*
- * DOES EXACTLY THE SAME AS after_schedchange_hook, for the "in" process.
* Create the processlist entry for the child process. Put the last
* position in x at the current time value.
*
/* Find process pid_in in the list... */
process_in = lttv_state_find_process(ts, ANY_CPU, pid_in);
//process_in = tfs->process;
- //guint cpu = ltt_tracefile_num(tfc->tf);
+ //guint cpu = tfs->cpu;
//process_in = ts->running_process[cpu];
/* It should exist, because we are after the state update. */
#ifdef EXTRA_CHECK
processlist_add(process_list,
drawing,
pid_in,
+ process_in->tgid,
process_in->cpu,
process_in->ppid,
&birth,
tfc->t_context->index,
process_in->name,
+ process_in->brand,
&pl_height,
&process_info,
&hashed_process_data_in);
-1,
pl_height);
gtk_widget_queue_draw(drawing->drawing_area);
- }
- /* Set the current process */
- process_list->current_hash_data[process_in->cpu] =
- hashed_process_data_in;
-
- if(ltt_time_compare(hashed_process_data_in->next_good_time,
- evtime) <= 0)
- {
- TimeWindow time_window =
- lttvwindow_get_time_window(control_flow_data->tab);
-
-#ifdef EXTRA_CHECK
- if(ltt_time_compare(evtime, time_window.start_time) == -1
- || ltt_time_compare(evtime, time_window.end_time) == 1)
- return;
-#endif //EXTRA_CHECK
- Drawing_t *drawing = control_flow_data->drawing;
- guint width = drawing->width;
- guint new_x;
-
- convert_time_to_pixels(
- time_window,
- evtime,
- width,
- &new_x);
-
- if(hashed_process_data_in->x.middle != new_x) {
- hashed_process_data_in->x.middle = new_x;
- hashed_process_data_in->x.middle_used = FALSE;
- hashed_process_data_in->x.middle_marked = FALSE;
- }
- }
+ } 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;
}
for(i=0;i<tc->tracefiles->len;i++) {
tfc = g_array_index(tc->tracefiles, LttvTracefileContext*, i);
if(ltt_tracefile_name(tfc->tf) == LTT_NAME_CPU
- && ltt_tracefile_num(tfc->tf) == process_info->cpu)
+ && tfs->cpu == process_info->cpu)
break;
}
projects / lttv.git / blobdiff