X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fcontrolflow%2Feventhooks.c;h=8431d771a5f263077ceb5f2aa861b90eb073eecf;hb=b154e818a5378f1a2529a0e4d287b3f6dda1731e;hp=cc4a553be7d65ca49a047fc05e0755506730bee1;hpb=7b5f6cf19fe5b312dc0c5712b0fceddeed2fe11f;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 cc4a553b..8431d771 100644 --- a/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c +++ b/ltt/branches/poly/lttv/modules/gui/controlflow/eventhooks.c @@ -180,10 +180,12 @@ static void request_background_data(ControlFlowData *control_flow_data) * @return The widget created. */ GtkWidget * -h_guicontrolflow(Tab *tab) +h_guicontrolflow(LttvPlugin *plugin) { + LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin); + Tab *tab = ptab->tab; g_info("h_guicontrolflow, %p", tab); - ControlFlowData *control_flow_data = guicontrolflow(tab) ; + ControlFlowData *control_flow_data = guicontrolflow(ptab); control_flow_data->tab = tab; @@ -218,8 +220,10 @@ void legend_destructor(GtkWindow *legend) /* Create a popup legend */ GtkWidget * -h_legend(Tab *tab) +h_legend(LttvPlugin *plugin) { + LttvPluginTab *ptab = LTTV_PLUGIN_TAB(plugin); + Tab *tab = ptab->tab; g_info("h_legend, %p", tab); GtkWindow *legend = GTK_WINDOW(gtk_window_new(GTK_WINDOW_TOPLEVEL)); @@ -265,7 +269,7 @@ int event_selected_hook(void *hook_data, void *call_data) static inline PropertiesLine prepare_s_e_line(LttvProcessState *process) { PropertiesLine prop_line; - prop_line.line_width = 2; + prop_line.line_width = 5; prop_line.style = GDK_LINE_SOLID; prop_line.y = MIDDLE; //GdkColormap *colormap = gdk_colormap_get_system(); @@ -341,8 +345,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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 @@ -356,7 +362,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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)) { /* 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 @@ -364,6 +373,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) * 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) @@ -384,7 +394,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); @@ -394,10 +404,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid_out, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -516,7 +527,10 @@ int before_schedchange_hook(void *hook_data, void *call_data) } } - { + tfc->target_pid = pid_in; + if(!filter || !filter->head || + lttv_filter_tree_parse(filter->head,e,tfc->tf, + tfc->t_context->t,tfc)) { /* 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 @@ -526,6 +540,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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 @@ -541,7 +556,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) 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); @@ -551,10 +566,11 @@ int before_schedchange_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid_in, + process->tgid, tfs->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -677,6 +693,7 @@ int before_schedchange_hook(void *hook_data, void *call_data) } else g_warning("Cannot find pin_in in schedchange %u", pid_in); } + tfc->target_pid = target_pid_saved; return 0; @@ -729,6 +746,12 @@ int after_schedchange_hook(void *hook_data, void *call_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)) + return FALSE; + LttTime evtime = ltt_event_time(e); /* Add process to process list (if not present) */ @@ -751,6 +774,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) //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 @@ -762,7 +786,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) 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); @@ -772,10 +796,11 @@ int after_schedchange_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid_in, + process_in->tgid, process_in->cpu, process_in->ppid, &birth, - tfc->t_context->index, + trace_num, process_in->name, process_in->brand, &pl_height, @@ -787,7 +812,7 @@ int after_schedchange_hook(void *hook_data, void *call_data) 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, @@ -856,6 +881,12 @@ int before_execmode_hook(void *hook_data, void *call_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)) + return FALSE; + LttTime evtime = ltt_event_time(e); /* we are in a execmode, before the state update. We must draw the @@ -865,6 +896,7 @@ int before_execmode_hook(void *hook_data, void *call_data) /* 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); @@ -879,14 +911,14 @@ int before_execmode_hook(void *hook_data, void *call_data) 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); @@ -896,10 +928,11 @@ int before_execmode_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -911,7 +944,7 @@ int before_execmode_hook(void *hook_data, void *call_data) 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; } @@ -1052,11 +1085,18 @@ int before_process_exit_hook(void *hook_data, void *call_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)) + 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; @@ -1069,14 +1109,14 @@ int before_process_exit_hook(void *hook_data, void *call_data) 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); @@ -1086,10 +1126,11 @@ int before_process_exit_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -1242,8 +1283,15 @@ int before_process_release_hook(void *hook_data, void *call_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)) + return FALSE; + LttTime evtime = ltt_event_time(e); + guint trace_num = ts->parent.index; guint pid; { @@ -1271,7 +1319,7 @@ int before_process_release_hook(void *hook_data, void *call_data) pid, process->cpu, &birth, - tfc->t_context->index); + trace_num); if(unlikely(hashed_process_data == NULL)) { g_assert(pid == 0 || pid != process->ppid); @@ -1281,10 +1329,11 @@ int before_process_release_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -1436,6 +1485,12 @@ int after_process_fork_hook(void *hook_data, void *call_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)) + return FALSE; + LttTime evtime = ltt_event_time(e); guint child_pid; @@ -1457,6 +1512,7 @@ int after_process_fork_hook(void *hook_data, void *call_data) 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. */ @@ -1464,7 +1520,7 @@ int after_process_fork_hook(void *hook_data, void *call_data) 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); @@ -1474,10 +1530,11 @@ int after_process_fork_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, child_pid, + process_child->tgid, process_child->cpu, process_child->ppid, &birth, - tfc->t_context->index, + trace_num, process_child->name, process_child->brand, &pl_height, @@ -1487,6 +1544,11 @@ int after_process_fork_hook(void *hook_data, void *call_data) -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); } @@ -1557,11 +1619,18 @@ int after_process_exit_hook(void *hook_data, void *call_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)) + 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. */ @@ -1576,14 +1645,14 @@ int after_process_exit_hook(void *hook_data, void *call_data) 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); @@ -1593,10 +1662,11 @@ int after_process_exit_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -1609,7 +1679,7 @@ int after_process_exit_hook(void *hook_data, void *call_data) } /* Set the current process */ - process_list->current_hash_data[process->cpu] = + process_list->current_hash_data[trace_num][process->cpu] = hashed_process_data; } @@ -1656,7 +1726,17 @@ int after_fs_exec_hook(void *hook_data, void *call_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)) + return FALSE; + guint cpu = tfs->cpu; + guint trace_num = ts->parent.index; LttvProcessState *process = ts->running_process[cpu]; g_assert(process != NULL); @@ -1671,14 +1751,14 @@ int after_fs_exec_hook(void *hook_data, void *call_data) 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); @@ -1688,10 +1768,11 @@ int after_fs_exec_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -1703,7 +1784,7 @@ int after_fs_exec_hook(void *hook_data, void *call_data) 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; } @@ -1726,7 +1807,17 @@ int after_user_generic_thread_brand_hook(void *hook_data, void *call_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)) + return FALSE; + guint cpu = tfs->cpu; + guint trace_num = ts->parent.index; LttvProcessState *process = ts->running_process[cpu]; g_assert(process != NULL); @@ -1741,14 +1832,14 @@ int after_user_generic_thread_brand_hook(void *hook_data, void *call_data) 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); @@ -1758,10 +1849,11 @@ int after_user_generic_thread_brand_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid, + process->tgid, process->cpu, process->ppid, &birth, - tfc->t_context->index, + trace_num, process->name, process->brand, &pl_height, @@ -1773,7 +1865,7 @@ int after_user_generic_thread_brand_hook(void *hook_data, void *call_data) 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; } @@ -1810,6 +1902,12 @@ int after_event_enum_process_hook(void *hook_data, void *call_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)) + return FALSE; + LttTime evtime = ltt_event_time(e); /* Add process to process list (if not present) */ @@ -1819,6 +1917,7 @@ int after_event_enum_process_hook(void *hook_data, void *call_data) HashedProcessData *hashed_process_data_in = NULL; ProcessList *process_list = control_flow_data->process_list; + guint trace_num = ts->parent.index; guint pid_in; { @@ -1830,6 +1929,7 @@ int after_event_enum_process_hook(void *hook_data, void *call_data) 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 @@ -1841,7 +1941,7 @@ int after_event_enum_process_hook(void *hook_data, void *call_data) 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) @@ -1853,10 +1953,11 @@ int after_event_enum_process_hook(void *hook_data, void *call_data) processlist_add(process_list, drawing, pid_in, + process_in->tgid, process_in->cpu, process_in->ppid, &birth, - tfc->t_context->index, + trace_num, process_in->name, process_in->brand, &pl_height, @@ -1867,10 +1968,12 @@ int after_event_enum_process_hook(void *hook_data, void *call_data) 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_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; } @@ -2513,10 +2616,19 @@ int after_chunk(void *hook_data, void *call_data) 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 */