#include <lttv/iattribute.h>
#include <lttv/lttvfilter.h>
#include <ltt/trace.h>
+#include <ltt/facility.h>
#define PATH_LENGTH 256
#define DEFAULT_TIME_WIDTH_S 1
char * get_unload_module(char ** loaded_module_name, int nb_module);
char * get_remove_trace(char ** all_trace_name, int nb_trace);
char * get_selection(char ** all_name, int nb, char *title, char * column_title);
-void get_filter_selection(LttvTracesetSelector *s, char *title, char * column_title);
+gboolean get_filter_selection(LttvTracesetSelector *s, char *title, char * column_title);
void * create_tab(MainWindow * parent, MainWindow * current_window,
GtkNotebook * notebook, char * label);
LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset);
-void redraw_viewer(MainWindow * mw_data, TimeWindow * time_window, unsigned nb_events);
-
+void redraw_viewer(MainWindow * mw_data, TimeWindow * time_window);
+unsigned get_max_event_number(MainWindow * mw_data);
enum {
CHECKBOX_COLUMN,
LttvTracesetSelector * s;
LttvTraceSelector * trace;
LttvTracefileSelector * tracefile;
- int i, j, nb_trace, nb_tracefile, nb_control, nb_per_cpu;
+ LttvEventtypeSelector * eventtype;
+ int i, j, k, m;
+ int nb_trace, nb_tracefile, nb_control, nb_per_cpu, nb_facility, nb_event;
LttvTrace * trace_v;
LttTrace * t;
LttTracefile *tf;
+ LttFacility * fac;
+ LttEventType * et;
s = lttv_traceset_selector_new(lttv_traceset_name(traceset));
nb_trace = lttv_traceset_number(traceset);
trace_v = lttv_traceset_get(traceset, i);
t = lttv_trace(trace_v);
trace = lttv_trace_selector_new(t);
- lttv_traceset_selector_add(s, trace);
+ lttv_traceset_selector_trace_add(s, trace);
+
+ nb_facility = ltt_trace_facility_number(t);
+ for(k=0;k<nb_facility;k++){
+ fac = ltt_trace_facility_get(t,k);
+ nb_event = (int) ltt_facility_eventtype_number(fac);
+ for(m=0;m<nb_event;m++){
+ et = ltt_facility_eventtype_get(fac,m);
+ eventtype = lttv_eventtype_selector_new(et);
+ lttv_trace_selector_eventtype_add(trace, eventtype);
+ }
+ }
+
nb_control = ltt_trace_control_tracefile_number(t);
nb_per_cpu = ltt_trace_per_cpu_tracefile_number(t);
nb_tracefile = nb_control + nb_per_cpu;
else
tf = ltt_trace_per_cpu_tracefile_get(t, j - nb_control);
tracefile = lttv_tracefile_selector_new(tf);
- lttv_trace_selector_add(trace, tracefile);
+ lttv_trace_selector_tracefile_add(trace, tracefile);
+ lttv_eventtype_selector_copy(trace, tracefile);
}
}
return s;
void
insert_viewer_wrap(GtkWidget *menuitem, gpointer user_data)
{
- GdkWindow * win;
- GdkCursor * new;
guint val = 20;
- GtkWidget* widget = menuitem;
- new = gdk_cursor_new(GDK_X_CURSOR);
- if(GTK_IS_MENU_ITEM(menuitem)){
- widget = lookup_widget(menuitem, "MToolbar2");
- }
- win = gtk_widget_get_parent_window(widget);
- gdk_window_set_cursor(win, new);
- gdk_cursor_unref(new);
- gdk_window_stick(win);
- gdk_window_unstick(win);
-
insert_viewer((GtkWidget*)menuitem, (view_constructor)user_data);
// selected_hook(&val);
-
- gdk_window_set_cursor(win, NULL);
}
MainWindow * mw_data;
GtkWidget * viewer;
LttvTracesetSelector * s;
- unsigned * size;
TimeInterval * time_interval;
- TimeWindow time_window;
+ TimeWindow time_window, t;
mw_data = get_window_data_struct(widget);
if(!mw_data->current_tab) return;
// Added by MD
// g_object_unref(G_OBJECT(viewer));
- size = (unsigned*)g_object_get_data(G_OBJECT(viewer), MAX_NUMBER_EVENT);
- if(size == NULL) *size = G_MAXULONG;
-
time_window = mw_data->current_tab->time_window;
time_interval = (TimeInterval*)g_object_get_data(G_OBJECT(viewer), TRACESET_TIME_SPAN);
if(time_interval){
+ t = time_window;
time_window.start_time = time_interval->startTime;
time_window.time_width = ltt_time_sub(time_interval->endTime,time_interval->startTime);
}
- redraw_viewer(mw_data,&time_window, *size);
+ redraw_viewer(mw_data,&time_window);
set_current_time(mw_data,&(mw_data->current_tab->current_time));
+ if(time_interval){
+ set_time_window(mw_data,&t);
+ }
}
}
}
-void redraw_viewer(MainWindow * mw_data, TimeWindow * time_window, unsigned nb_events)
+unsigned get_max_event_number(MainWindow * mw_data)
+{
+ unsigned nb = 0, *size;
+ GtkWidget * w;
+
+ w = gtk_multi_vpaned_get_first_widget(mw_data->current_tab->multi_vpaned);
+ while(w){
+ size = (unsigned*)g_object_get_data(G_OBJECT(w), MAX_NUMBER_EVENT);
+ if(size == NULL){
+ nb = G_MAXULONG;
+ break;
+ }else{
+ if(nb < *size)
+ nb = *size;
+ }
+ w = gtk_multi_vpaned_get_next_widget(mw_data->current_tab->multi_vpaned);
+ }
+ return nb;
+}
+
+void redraw_viewer(MainWindow * mw_data, TimeWindow * time_window)
{
+ unsigned max_nb_events;
+ GdkWindow * win;
+ GdkCursor * new;
+ GtkWidget* widget;
+
+ new = gdk_cursor_new(GDK_X_CURSOR);
+ widget = lookup_widget(mw_data->mwindow, "MToolbar2");
+ win = gtk_widget_get_parent_window(widget);
+ gdk_window_set_cursor(win, new);
+ gdk_cursor_unref(new);
+ gdk_window_stick(win);
+ gdk_window_unstick(win);
+
//update time window of each viewer, let viewer insert hooks needed by process_traceset
set_time_window(mw_data, time_window);
+
+ max_nb_events = get_max_event_number(mw_data);
process_traceset_api(mw_data, time_window->start_time,
ltt_time_add(time_window->start_time,time_window->time_width),
- nb_events);
+ max_nb_events);
//call hooks to show each viewer and let them remove hooks
show_viewer(mw_data);
+
+ gdk_window_set_cursor(win, NULL);
}
void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t)
{
- int j, nb_tracefile, nb_control, nb_per_cpu;
+ int j, k, m, nb_tracefile, nb_control, nb_per_cpu, nb_facility, nb_event;
LttvTracesetSelector * s;
LttvTraceSelector * trace;
LttvTracefileSelector * tracefile;
+ LttvEventtypeSelector * eventtype;
LttTracefile * tf;
GtkWidget * w;
+ LttFacility * fac;
+ LttEventType * et;
w = gtk_multi_vpaned_get_first_widget(paned);
while(w){
s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
trace = lttv_trace_selector_new(t);
- lttv_traceset_selector_add(s, trace);
+ lttv_traceset_selector_trace_add(s, trace);
+
+ nb_facility = ltt_trace_facility_number(t);
+ for(k=0;k<nb_facility;k++){
+ fac = ltt_trace_facility_get(t,k);
+ nb_event = (int) ltt_facility_eventtype_number(fac);
+ for(m=0;m<nb_event;m++){
+ et = ltt_facility_eventtype_get(fac,m);
+ eventtype = lttv_eventtype_selector_new(et);
+ lttv_trace_selector_eventtype_add(trace, eventtype);
+ }
+ }
+
nb_control = ltt_trace_control_tracefile_number(t);
nb_per_cpu = ltt_trace_per_cpu_tracefile_number(t);
nb_tracefile = nb_control + nb_per_cpu;
else
tf = ltt_trace_per_cpu_tracefile_get(t, j - nb_control);
tracefile = lttv_tracefile_selector_new(tf);
- lttv_trace_selector_add(trace, tracefile);
+ lttv_trace_selector_tracefile_add(trace, tracefile);
+ lttv_eventtype_selector_copy(trace, tracefile);
}
w = gtk_multi_vpaned_get_next_widget(paned);
gtk_widget_destroy((GtkWidget*)file_selector);
//update current tab
- redraw_viewer(mw_data, &(mw_data->current_tab->time_window), G_MAXULONG);
+ update_traceset(mw_data);
+ redraw_viewer(mw_data, &(mw_data->current_tab->time_window));
set_current_time(mw_data,&(mw_data->current_tab->current_time));
break;
case GTK_RESPONSE_REJECT:
w = gtk_multi_vpaned_get_first_widget(paned);
while(w){
s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
- t = lttv_traceset_selector_get(s,i);
- lttv_traceset_selector_remove(s, i);
+ t = lttv_traceset_selector_trace_get(s,i);
+ lttv_traceset_selector_trace_remove(s, i);
lttv_trace_selector_destroy(t);
w = gtk_multi_vpaned_get_next_widget(paned);
}
//unselect the trace from the current viewer
w = gtk_multi_vpaned_get_widget(mw_data->current_tab->multi_vpaned);
s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
- t = lttv_traceset_selector_get(s,i);
+ t = lttv_traceset_selector_trace_get(s,i);
lttv_trace_selector_set_selected(t, FALSE);
//check if other viewers select the trace
w = gtk_multi_vpaned_get_first_widget(mw_data->current_tab->multi_vpaned);
while(w){
s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
- t = lttv_traceset_selector_get(s,i);
+ t = lttv_traceset_selector_trace_get(s,i);
selected = lttv_trace_selector_get_selected(t);
if(selected)break;
w = gtk_multi_vpaned_get_next_widget(mw_data->current_tab->multi_vpaned);
LTTV_TRACESET_CONTEXT(mw_data->current_tab->
traceset_info->traceset_context),traceset);
//update current tab
- redraw_viewer(mw_data, &(mw_data->current_tab->time_window), G_MAXULONG);
+ update_traceset(mw_data);
+ redraw_viewer(mw_data, &(mw_data->current_tab->time_window));
set_current_time(mw_data,&(mw_data->current_tab->current_time));
}
break;
{
TimeInterval *time_span;
TimeWindow time_window;
- LttTime current_time, time_delta, time_s, time_e;
+ LttTime current_time, time_delta, time_s, time_e, time_t;
MainWindow * mw_data = get_window_data_struct(widget);
+ if(size == 1) return;
+
time_span = LTTV_TRACESET_CONTEXT(mw_data->current_tab->
traceset_info->traceset_context)->Time_Span;
time_window = mw_data->current_tab->time_window;
}else{
time_window.time_width = ltt_time_div(time_window.time_width, size);
if(ltt_time_compare(time_window.time_width,time_delta) > 0)
- time_window.time_width = time_delta;
+ time_window.time_width = time_delta;
- time_s = ltt_time_sub(current_time,ltt_time_div(time_window.time_width, 2));
- time_e = ltt_time_add(current_time,ltt_time_div(time_window.time_width, 2));
+ time_t = ltt_time_div(time_window.time_width, 2);
+ if(ltt_time_compare(current_time, time_t) < 0){
+ time_s = time_span->startTime;
+ } else {
+ time_s = ltt_time_sub(current_time,time_t);
+ }
+ time_e = ltt_time_add(current_time,time_t);
if(ltt_time_compare(time_span->startTime, time_s) > 0){
time_s = time_span->startTime;
}else if(ltt_time_compare(time_span->endTime, time_e) < 0){
}
time_window.start_time = time_s;
}
- redraw_viewer(mw_data, &time_window, G_MAXULONG);
+ redraw_viewer(mw_data, &time_window);
set_current_time(mw_data,&(mw_data->current_tab->current_time));
gtk_multi_vpaned_set_adjust(mw_data->current_tab->multi_vpaned, FALSE);
}
g_printf("There is no viewer yet\n");
return;
}
- get_filter_selection(s, "Configure trace and tracefile filter", "Select traces and tracefiles");
+ if(get_filter_selection(s, "Configure trace and tracefile filter", "Select traces and tracefiles")){
+ update_traceset(mw_data);
+ redraw_viewer(mw_data, &(mw_data->current_tab->time_window));
+ set_current_time(mw_data,&(mw_data->current_tab->current_time));
+ }
}
void
gtk_main_quit ();
}
+gboolean
+on_MWindow_configure (GtkWidget *widget,
+ GdkEventConfigure *event,
+ gpointer user_data)
+{
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)widget);
+ float width = event->width;
+ Tab * tab = mw_data->tab;
+ TimeWindow time_win;
+ double ratio;
+ TimeInterval *time_span;
+ LttTime time;
+
+ // MD : removed time width modification upon resizing of the main window.
+ // The viewers will redraw themselves completely, without time interval
+ // modification.
+/* while(tab){
+ if(mw_data->window_width){
+ time_span = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)->Time_Span ;
+ time_win = tab->time_window;
+ ratio = width / mw_data->window_width;
+ tab->time_window.time_width = ltt_time_mul(time_win.time_width,ratio);
+ time = ltt_time_sub(time_span->endTime, time_win.start_time);
+ if(ltt_time_compare(time, tab->time_window.time_width) < 0){
+ tab->time_window.time_width = time;
+ }
+ }
+ tab = tab->next;
+ }
+
+ mw_data->window_width = (int)width;
+ */
+ return FALSE;
+}
void
on_MNotebook_switch_page (GtkNotebook *notebook,
void update_filter(LttvTracesetSelector *s, GtkTreeStore *store )
{
- GtkTreeIter iter, child_iter;
- int i, j;
+ GtkTreeIter iter, child_iter, child_iter1, child_iter2;
+ int i, j, k, nb_eventtype;
LttvTraceSelector * trace;
LttvTracefileSelector * tracefile;
- gboolean value, value1;
+ LttvEventtypeSelector * eventtype;
+ gboolean value, value1, value2;
if(gtk_tree_model_get_iter_first((GtkTreeModel*)store, &iter)){
i = 0;
do{
- trace = lttv_traceset_selector_get(s, i);
+ trace = lttv_traceset_selector_trace_get(s, i);
+ nb_eventtype = lttv_trace_selector_eventtype_number(trace);
gtk_tree_model_get ((GtkTreeModel*)store, &iter, CHECKBOX_COLUMN, &value,-1);
if(value){
j = 0;
if(gtk_tree_model_iter_children ((GtkTreeModel*)store, &child_iter, &iter)){
do{
- tracefile = lttv_trace_selector_get(trace, j);
- gtk_tree_model_get ((GtkTreeModel*)store, &child_iter, CHECKBOX_COLUMN, &value1,-1);
- lttv_tracefile_selector_set_selected(tracefile,value1);
+ if(j<1){//eventtype selector for trace
+ gtk_tree_model_get ((GtkTreeModel*)store, &child_iter, CHECKBOX_COLUMN, &value2,-1);
+ if(value2){
+ k=0;
+ if(gtk_tree_model_iter_children ((GtkTreeModel*)store, &child_iter1, &child_iter)){
+ do{
+ eventtype = lttv_trace_selector_eventtype_get(trace,k);
+ gtk_tree_model_get ((GtkTreeModel*)store, &child_iter1, CHECKBOX_COLUMN, &value2,-1);
+ lttv_eventtype_selector_set_selected(eventtype,value2);
+ k++;
+ }while(gtk_tree_model_iter_next((GtkTreeModel*)store, &child_iter1));
+ }
+ }
+ }else{ //tracefile selector
+ tracefile = lttv_trace_selector_tracefile_get(trace, j - 1);
+ gtk_tree_model_get ((GtkTreeModel*)store, &child_iter, CHECKBOX_COLUMN, &value1,-1);
+ lttv_tracefile_selector_set_selected(tracefile,value1);
+ if(value1){
+ gtk_tree_model_iter_children((GtkTreeModel*)store, &child_iter1, &child_iter); //eventtype selector
+ gtk_tree_model_get ((GtkTreeModel*)store, &child_iter1, CHECKBOX_COLUMN, &value2,-1);
+ if(value2){
+ k = 0;
+ if(gtk_tree_model_iter_children ((GtkTreeModel*)store, &child_iter2, &child_iter1)){
+ do{//eventtype selector for tracefile
+ eventtype = lttv_tracefile_selector_eventtype_get(tracefile,k);
+ gtk_tree_model_get ((GtkTreeModel*)store, &child_iter2, CHECKBOX_COLUMN, &value2,-1);
+ lttv_eventtype_selector_set_selected(eventtype,value2);
+ k++;
+ }while(gtk_tree_model_iter_next((GtkTreeModel*)store, &child_iter2));
+ }
+ }
+ }
+ }
j++;
}while(gtk_tree_model_iter_next((GtkTreeModel*)store, &child_iter));
}
}
}
-void get_filter_selection(LttvTracesetSelector *s,char *title, char * column_title)
+gboolean get_filter_selection(LttvTracesetSelector *s,char *title, char * column_title)
{
GtkWidget * dialogue;
GtkTreeStore * store;
GtkWidget * scroll_win;
GtkCellRenderer * renderer;
GtkTreeViewColumn * column;
- GtkTreeIter iter, child_iter;
- int i, j, id, nb_trace, nb_tracefile;
+ GtkTreeIter iter, child_iter, child_iter1, child_iter2;
+ int i, j, k, id, nb_trace, nb_tracefile, nb_eventtype;
LttvTraceSelector * trace;
LttvTracefileSelector * tracefile;
+ LttvEventtypeSelector * eventtype;
char * name;
gboolean checked;
GTK_STOCK_OK,GTK_RESPONSE_ACCEPT,
GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT,
NULL);
- gtk_window_set_default_size((GtkWindow*)dialogue, 300, 100);
+ gtk_window_set_default_size((GtkWindow*)dialogue, 300, 500);
store = gtk_tree_store_new (TOTAL_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING);
tree = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
gtk_widget_show(scroll_win);
gtk_widget_show(tree);
- nb_trace = lttv_traceset_selector_number(s);
+ nb_trace = lttv_traceset_selector_trace_number(s);
for(i=0;i<nb_trace;i++){
- trace = lttv_traceset_selector_get(s, i);
+ trace = lttv_traceset_selector_trace_get(s, i);
name = lttv_trace_selector_get_name(trace);
gtk_tree_store_append (store, &iter, NULL);
checked = lttv_trace_selector_get_selected(trace);
CHECKBOX_COLUMN,checked,
NAME_COLUMN,name,
-1);
- nb_tracefile = lttv_trace_selector_number(trace);
+
+ gtk_tree_store_append (store, &child_iter, &iter);
+ gtk_tree_store_set (store, &child_iter,
+ CHECKBOX_COLUMN, checked,
+ NAME_COLUMN,"eventtype",
+ -1);
+
+ nb_eventtype = lttv_trace_selector_eventtype_number(trace);
+ for(j=0;j<nb_eventtype;j++){
+ eventtype = lttv_trace_selector_eventtype_get(trace,j);
+ name = lttv_eventtype_selector_get_name(eventtype);
+ checked = lttv_eventtype_selector_get_selected(eventtype);
+ gtk_tree_store_append (store, &child_iter1, &child_iter);
+ gtk_tree_store_set (store, &child_iter1,
+ CHECKBOX_COLUMN, checked,
+ NAME_COLUMN,name,
+ -1);
+ }
+
+ nb_tracefile = lttv_trace_selector_tracefile_number(trace);
for(j=0;j<nb_tracefile;j++){
- tracefile = lttv_trace_selector_get(trace, j);
+ tracefile = lttv_trace_selector_tracefile_get(trace, j);
name = lttv_tracefile_selector_get_name(tracefile);
gtk_tree_store_append (store, &child_iter, &iter);
checked = lttv_tracefile_selector_get_selected(tracefile);
CHECKBOX_COLUMN, checked,
NAME_COLUMN,name,
-1);
+
+ gtk_tree_store_append (store, &child_iter1, &child_iter);
+ gtk_tree_store_set (store, &child_iter1,
+ CHECKBOX_COLUMN, checked,
+ NAME_COLUMN,"eventtype",
+ -1);
+
+ for(k=0;k<nb_eventtype;k++){
+ eventtype = lttv_tracefile_selector_eventtype_get(tracefile,k);
+ name = lttv_eventtype_selector_get_name(eventtype);
+ checked = lttv_eventtype_selector_get_selected(eventtype);
+ gtk_tree_store_append (store, &child_iter2, &child_iter1);
+ gtk_tree_store_set (store, &child_iter2,
+ CHECKBOX_COLUMN, checked,
+ NAME_COLUMN,name,
+ -1);
+ }
}
}
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
update_filter(s, store);
+ gtk_widget_destroy(dialogue);
+ return TRUE;
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
default:
gtk_widget_destroy(dialogue);
break;
}
+ return FALSE;
}
char * get_remove_trace(char ** all_trace_name, int nb_trace)
LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->endTime.tv_sec;
tmp_time.tv_nsec = 0;
tmp_tab->time_window.time_width = tmp_time ;
- tmp_tab->current_time.tv_sec = tmp_time.tv_sec / 2;
- tmp_tab->current_time.tv_nsec = 0 ;
+ tmp_tab->current_time.tv_sec =
+ LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->startTime.tv_sec;
+ tmp_tab->current_time.tv_nsec =
+ LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->startTime.tv_nsec;
}
tmp_tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
// mw_data->current_tab = tmp_tab;
"Tab_Info",
tmp_tab,
(GDestroyNotify)tab_destructor);
+
+ lttv_state_add_event_hooks(
+ (LttvTracesetState*)tmp_tab->traceset_info->traceset_context);
gtk_notebook_append_page(notebook, (GtkWidget*)tmp_tab->multi_vpaned, tmp_tab->label);
list = gtk_container_get_children(GTK_CONTAINER(notebook));
projects / lttv.git / blobdiff