X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=d30a490da2399f450e6b683dd00f1ff957011a30;hb=53ac91316921e188b4e778a7b766016d4a6dd2a2;hp=21d09fc5529cc9fd89a79970649c41b6020be413;hpb=2eef04b5f3234a4e303bd6162eb20d055b7d44cf;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c index 21d09fc5..d30a490d 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -39,6 +39,7 @@ #include #include #include +#include #include #include #include @@ -46,7 +47,6 @@ #include #include #include -#include #define DEFAULT_TIME_WIDTH_S 1 @@ -68,22 +68,12 @@ char * get_load_module(char ** load_module_name, int nb_module); 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); -gboolean get_filter_selection(LttvTracesetSelector *s, char *title, char * column_title); Tab* create_tab(MainWindow * mw, Tab *copy_tab, GtkNotebook * notebook, char * label); static void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor); -void update_filter(LttvTracesetSelector *s, GtkTreeStore *store ); - -void checkbox_changed(GtkTreeView *treeview, - GtkTreePath *arg1, - GtkTreeViewColumn *arg2, - gpointer user_data); -void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i); -void add_trace_into_traceset_selector(GtkWidget * paned, LttTrace * trace); -Tab *create_new_tab(GtkWidget* widget, gpointer user_data); -LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset); +Tab *create_new_tab(GtkWidget* widget, gpointer user_data); static gboolean lttvwindow_process_pending_requests(Tab *tab); @@ -99,60 +89,6 @@ enum N_COLUMNS }; -/* Construct a selector(filter), which will be associated with a viewer, - * and provides an interface for user to select interested events and traces - */ - -LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset) -{ - LttvTracesetSelector * s; - LttvTraceSelector * trace; - LttvTracefileSelector * tracefile; - 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); - for(i=0;iviewer_container; - s = construct_traceset_selector(tab->traceset_info->traceset); viewer = (GtkWidget*)constructor(tab); if(viewer) { @@ -489,6 +423,10 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) time_change_manager(tab, new_time_window); current_time_change_manager(tab, new_current_time); + //FIXME : we delete the filter tree, when it should be updated. + lttv_filter_tree_destroy(tab->filter); + tab->filter = NULL; + #if 0 /* Set scrollbar */ GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); @@ -660,7 +598,7 @@ MainWindow * get_window_data_struct(GtkWidget * widget) mw = lookup_widget(widget, "MWindow"); if(mw == NULL){ - g_printf("Main window does not exist\n"); + g_info("Main window does not exist\n"); return NULL; } @@ -681,10 +619,10 @@ void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone) MainWindow * parent = get_window_data_struct(widget); if(clone){ - g_printf("Clone : use the same traceset\n"); + g_info("Clone : use the same traceset\n"); construct_main_window(parent); }else{ - g_printf("Empty : traceset is set to NULL\n"); + g_info("Empty : traceset is set to NULL\n"); construct_main_window(NULL); } } @@ -859,7 +797,7 @@ void open_traceset(GtkWidget * widget, gpointer user_data) case GTK_RESPONSE_OK: dir = gtk_file_selection_get_selections (file_selector); traceset = lttv_traceset_load(dir[0]); - g_printf("Open a trace set %s\n", dir[0]); + g_info("Open a trace set %s\n", dir[0]); //Not finished yet g_strfreev(dir); case GTK_RESPONSE_REJECT: @@ -1699,62 +1637,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) #undef list_out -/* add_trace_into_traceset_selector, each instance of a viewer has an associated - * selector (filter), when a trace is added into traceset, the selector should - * reflect the change. The function is used to update the selector - */ -#if 0 -void add_trace_into_traceset_selector(GtkWidget * paned, LttTrace * t) -{ - 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_multivpaned_get_first_widget(GTK_MULTIVPANED(paned)); - while(w){ - s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); - - if(s){ - trace = lttv_trace_selector_new(t); - lttv_traceset_selector_trace_add(s, trace); - - nb_facility = ltt_trace_facility_number(t); - for(k=0;ktraceset_info->traceset; @@ -1888,31 +1770,6 @@ void add_trace(GtkWidget * widget, gpointer user_data) } } - -/* remove_trace_into_traceset_selector, each instance of a viewer has an associated - * selector (filter), when a trace is remove from traceset, the selector should - * reflect the change. The function is used to update the selector - */ -#if 0 -void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i) -{ - LttvTracesetSelector * s; - LttvTraceSelector * t; - GtkWidget * w; - - w = gtk_multivpaned_get_first_widget(GTK_MULTIVPANED(paned)); - while(w){ - s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); - if(s){ - t = lttv_traceset_selector_trace_get(s,i); - lttv_traceset_selector_trace_remove(s, i); - lttv_trace_selector_destroy(t); - }g_warning("Module dose not support filtering\n"); - w = gtk_multivpaned_get_next_widget(GTK_MULTIVPANED(paned)); - } -} -#endif //0 - /* remove_trace removes a trace from the current traceset if all viewers in * the current tab are not interested in the trace. It first displays a * dialogue, which shows all traces in the current traceset, to let user choose @@ -1920,9 +1777,11 @@ void remove_trace_from_traceset_selector(GtkWidget * paned, unsigned i) * it will remove the trace, recreate the traceset_contex, * and redraws all the viewer of the current tab. If there is on trace in the * current traceset, it will delete all viewers of the current tab + * + * It destroys the filter tree. FIXME... we should request for an update + * instead. */ -// MD : no filter version. void remove_trace(GtkWidget *widget, gpointer user_data) { LttTrace *trace; @@ -2234,12 +2093,12 @@ void stop_processing(GtkWidget *widget, gpointer user_data) void save(GtkWidget * widget, gpointer user_data) { - g_printf("Save\n"); + g_info("Save\n"); } void save_as(GtkWidget * widget, gpointer user_data) { - g_printf("Save as\n"); + g_info("Save as\n"); } @@ -2348,12 +2207,12 @@ void zoom_extended(GtkWidget * widget, gpointer user_data) void go_to_time(GtkWidget * widget, gpointer user_data) { - g_printf("Go to time\n"); + g_info("Go to time\n"); } void show_time_frame(GtkWidget * widget, gpointer user_data) { - g_printf("Show time frame\n"); + g_info("Show time frame\n"); } @@ -2384,7 +2243,7 @@ Tab *create_new_tab(GtkWidget* widget, gpointer user_data){ GtkNotebook * notebook = (GtkNotebook *)lookup_widget(widget, "MNotebook"); if(notebook == NULL){ - g_printf("Notebook does not exist\n"); + g_info("Notebook does not exist\n"); return NULL; } GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), @@ -2440,7 +2299,7 @@ on_close_tab_activate (GtkWidget *widget, MainWindow * mw_data = get_window_data_struct(widget); notebook = lookup_widget(widget, "MNotebook"); if(notebook == NULL){ - g_printf("Notebook does not exist\n"); + g_info("Notebook does not exist\n"); return; } @@ -2457,7 +2316,7 @@ on_close_tab_X_clicked (GtkWidget *widget, gint page_num; GtkWidget *notebook = lookup_widget(widget, "MNotebook"); if(notebook == NULL){ - g_printf("Notebook does not exist\n"); + g_info("Notebook does not exist\n"); return; } @@ -2511,7 +2370,7 @@ void on_cut_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Cut\n"); + g_info("Cut\n"); } @@ -2519,7 +2378,7 @@ void on_copy_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Copye\n"); + g_info("Copye\n"); } @@ -2527,7 +2386,7 @@ void on_paste_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Paste\n"); + g_info("Paste\n"); } @@ -2535,7 +2394,7 @@ void on_delete_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Delete\n"); + g_info("Delete\n"); } @@ -2602,47 +2461,11 @@ on_remove_viewer_activate (GtkMenuItem *menuitem, delete_viewer((GtkWidget*)menuitem, user_data); } -#if 0 -void -on_trace_filter_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); - LttvTracesetSelector * s; - GtkWidget * w; - GtkWidget * notebook = lookup_widget(GTK_WIDGET(menuitem), "MNotebook"); - - GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), - gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); - Tab *tab; - - if(!page) { - return; - } else { - tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); - } - - w = gtk_multivpaned_get_widget(GTK_MULTIVPANED(tab->multivpaned)); - - s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); - if(!s){ - g_printf("There is no viewer yet\n"); - return; - } - if(get_filter_selection(s, "Configure trace and tracefile filter", "Select traces and tracefiles")){ - //FIXME report filter change - //update_traceset(mw_data); - //call_pending_read_hooks(mw_data); - //lttvwindow_report_current_time(mw_data,&(tab->current_time)); - } -} -#endif //0 - void on_trace_facility_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Trace facility selector: %s\n"); + g_info("Trace facility selector: %s\n"); } @@ -2736,7 +2559,7 @@ on_load_library_activate (GtkMenuItem *menuitem, #endif //0 lttv_library_load(str1, &error); if(error != NULL) g_warning("%s", error->message); - else g_printf("Load library: %s\n", str); + else g_info("Load library: %s\n", str); g_strfreev(dir); case GTK_RESPONSE_REJECT: case GTK_RESPONSE_CANCEL: @@ -2849,9 +2672,9 @@ on_load_module_activate (GtkMenuItem *menuitem, GPtrArray *name; guint nb,i; gchar *module_name; + nb = lttv_library_module_number(library); LttvModuleInfo *module_info = g_new(LttvModuleInfo,nb); name = g_ptr_array_new(); - nb = lttv_library_module_number(library); /* ask for the module name */ for(i=0;imessage); - else g_printf("Load module: %s", module_name_out); + else g_info("Load module: %s", module_name_out); #if 0 @@ -2928,7 +2751,7 @@ on_load_module_activate (GtkMenuItem *menuitem, #endif //0 lttv_library_load(str1, &error); if(error != NULL) g_warning(error->message); - else g_printf("Load library: %s\n", str); + else g_info("Load library: %s\n", str); g_strfreev(dir); case GTK_RESPONSE_REJECT: case GTK_RESPONSE_CANCEL: @@ -3026,7 +2849,7 @@ on_unload_module_activate (GtkMenuItem *menuitem, LttvModuleInfo module_info; lttv_module_info(module, &module_info); - g_printf("Release module: %s\n", module_info.name); + g_info("Release module: %s\n", module_info.name); lttv_module_release(module); } @@ -3101,15 +2924,7 @@ void on_color_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Color\n"); -} - - -void -on_filter_activate (GtkMenuItem *menuitem, - gpointer user_data) -{ - g_printf("Filter\n"); + g_info("Color\n"); } @@ -3117,7 +2932,7 @@ void on_save_configuration_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Save configuration\n"); + g_info("Save configuration\n"); } @@ -3125,7 +2940,7 @@ void on_content_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Content\n"); + g_info("Content\n"); } @@ -3176,23 +2991,27 @@ on_about_activate (GtkMenuItem *menuitem, GtkWidget *label2 = gtk_label_new(""); gtk_misc_set_padding(GTK_MISC(label2), 10, 20); gtk_label_set_markup(GTK_LABEL(label2), "\ -Project author: Karim Yaghmour\n\ -\n\ Contributors :\n\ \n\ Michel Dagenais (New trace format, lttv main)\n\ Mathieu Desnoyers (Directory structure, build with automake/conf,\n\ - lttv gui, control flow view, gui green threads\n\ - with interruptible foreground and background computation,\n\ - detailed event list)\n\ -Benoit Des Ligneris (Cluster adaptation)\n\ + lttv gui, control flow view, gui cooperative trace reading\n\ + scheduler with interruptible foreground and background\n\ + computation, detailed event list)\n\ +Benoit Des Ligneris, Eric Clement (Cluster adaptation, work in progress)\n\ Xang-Xiu Yang (new trace reading library and converter, lttv gui, \n\ detailed event list and statistics view)\n\ -Tom Zanussi (RelayFS)"); +Tom Zanussi (RelayFS)\n\ +\n\ +Strongly inspired from the original Linux Trace Toolkit Visualizer made by\n\ +Karim Yaghmour"); GtkWidget *label3 = gtk_label_new(""); gtk_label_set_markup(GTK_LABEL(label3), "\ -Linux Trace Toolkit, Copyright (C) 2004 Karim Yaghmour\n\ +Linux Trace Toolkit Viewer, Copyright (C) 2004\n\ + Michel Dagenais\n\ + Mathieu Desnoyers\n\ + Xang-Xiu Yang\n\ Linux Trace Toolkit comes with ABSOLUTELY NO WARRANTY.\n\ This is free software, and you are welcome to redistribute it\n\ under certain conditions. See COPYING for details."); @@ -3378,7 +3197,7 @@ on_MWindow_destroy (GtkWidget *widget, g_object_unref(main_window->attributes); g_main_window_list = g_slist_remove(g_main_window_list, main_window); - g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list)); + g_info("There are now : %d windows\n",g_slist_length(g_main_window_list)); if(g_slist_length(g_main_window_list) == 0) gtk_main_quit (); } @@ -3896,237 +3715,10 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, } -/* callback function to check or uncheck the check box (filter) - */ - -void checkbox_changed(GtkTreeView *treeview, - GtkTreePath *arg1, - GtkTreeViewColumn *arg2, - gpointer user_data) -{ - GtkTreeStore * store = (GtkTreeStore *)gtk_tree_view_get_model (treeview); - GtkTreeIter iter; - gboolean value; - - if (gtk_tree_model_get_iter ((GtkTreeModel *)store, &iter, arg1)){ - gtk_tree_model_get ((GtkTreeModel *)store, &iter, CHECKBOX_COLUMN, &value, -1); - value = value? FALSE : TRUE; - gtk_tree_store_set (GTK_TREE_STORE (store), &iter, CHECKBOX_COLUMN, value, -1); - } - -} - - -/* According to user's selection, update selector(filter) - */ - -void update_filter(LttvTracesetSelector *s, GtkTreeStore *store ) -{ - GtkTreeIter iter, child_iter, child_iter1, child_iter2; - int i, j, k, nb_eventtype; - LttvTraceSelector * trace; - LttvTracefileSelector * tracefile; - LttvEventtypeSelector * eventtype; - gboolean value, value1, value2; - - if(gtk_tree_model_get_iter_first((GtkTreeModel*)store, &iter)){ - i = 0; - do{ - 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{ - 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)); - } - } - lttv_trace_selector_set_selected(trace,value); - i++; - }while(gtk_tree_model_iter_next((GtkTreeModel*)store, &iter)); - } -} - - /* Display a dialogue showing all eventtypes and traces, let user to select the interested * eventtypes, tracefiles and traces (filter) */ -gboolean get_filter_selection(LttvTracesetSelector *s,char *title, char * column_title) -{ - GtkWidget * dialogue; - GtkTreeStore * store; - GtkWidget * tree; - GtkWidget * scroll_win; - GtkCellRenderer * renderer; - GtkTreeViewColumn * column; - 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; - - dialogue = gtk_dialog_new_with_buttons(title, - NULL, - GTK_DIALOG_MODAL, - GTK_STOCK_OK,GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT, - NULL); - 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)); - g_object_unref (G_OBJECT (store)); - g_signal_connect (G_OBJECT (tree), "row-activated", - G_CALLBACK (checkbox_changed), - NULL); - - - renderer = gtk_cell_renderer_toggle_new (); - gtk_cell_renderer_toggle_set_radio((GtkCellRendererToggle *)renderer, FALSE); - - g_object_set (G_OBJECT (renderer),"activatable", TRUE, NULL); - - column = gtk_tree_view_column_new_with_attributes ("Checkbox", - renderer, - "active", CHECKBOX_COLUMN, - NULL); - gtk_tree_view_column_set_alignment (column, 0.5); - gtk_tree_view_column_set_fixed_width (column, 20); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - - renderer = gtk_cell_renderer_text_new (); - column = gtk_tree_view_column_new_with_attributes (column_title, - renderer, - "text", NAME_COLUMN, - NULL); - gtk_tree_view_column_set_alignment (column, 0.0); - gtk_tree_view_append_column (GTK_TREE_VIEW (tree), column); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW (tree), FALSE); - - scroll_win = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll_win), - GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); - gtk_container_add (GTK_CONTAINER (scroll_win), tree); - - gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialogue)->vbox), scroll_win,TRUE, TRUE,0); - - gtk_widget_show(scroll_win); - gtk_widget_show(tree); - - nb_trace = lttv_traceset_selector_trace_number(s); - for(i=0;imwindow, "MNotebook"); if(notebook == NULL){ - g_printf("Notebook does not exist\n"); + g_info("Notebook does not exist\n"); return; } //gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook)); @@ -4456,7 +4048,7 @@ void construct_main_window(MainWindow * parent) } } - g_printf("There are now : %d windows\n",g_slist_length(g_main_window_list)); + g_info("There are now : %d windows\n",g_slist_length(g_main_window_list)); } @@ -4496,7 +4088,8 @@ void tab_destructor(Tab * tab) ltt_trace_close(lttv_trace(trace)); } } - } + } + lttv_filter_destroy(tab->filter); lttv_traceset_destroy(tab->traceset_info->traceset); /* Remove the idle events requests processing function of the tab */ g_idle_remove_by_data(tab); @@ -4525,8 +4118,18 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, if(copy_tab) { tab->traceset_info->traceset = lttv_traceset_copy(copy_tab->traceset_info->traceset); + + /* Copy the previous tab's filter */ + /* We can clone the filter, as we copy the trace set also */ + /* The filter must always be in sync with the trace set */ + if(copy_tab->filter != NULL) + tab->filter = lttv_filter_clone(copy_tab->filter); + else + tab->filter = NULL; + } else { tab->traceset_info->traceset = lttv_traceset_new(); + tab->filter = NULL; } #ifdef DEBUG