#include <lttv/module.h>
#include <lttv/gtkdirsel.h>
#include <lttv/iattribute.h>
+#include <lttv/lttvfilter.h>
+#include <ltt/trace.h>
#define PATH_LENGTH 256
#define DEFAULT_TIME_WIDTH_S 1
-//extern LttvTracesetContext * gTracesetContext;
-extern LttTrace *gInit_Trace ;
+extern LttvTrace *g_init_trace ;
/** Array containing instanced objects. */
-extern GSList * Main_Window_List;
+extern GSList * g_main_window_list;
-static int gWinCount = 0;
+static int g_win_count = 0;
-mainWindow * get_window_data_struct(GtkWidget * widget);
+MainWindow * get_window_data_struct(GtkWidget * widget);
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 * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label);
+void get_filter_selection(LttvTracesetSelector *s, char *title, char * column_title);
+void * create_tab(MainWindow * parent, MainWindow * current_window,
+ GtkNotebook * notebook, char * label);
-void insertView(GtkWidget* widget, view_constructor constructor);
+void insert_viewer(GtkWidget* widget, view_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(GtkMultiVPaned * paned, unsigned i);
+void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * trace);
+
+LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset);
+
+void redraw_viewer(MainWindow * mw_data, TimeWindow * time_window, unsigned nb_events);
+
+
+enum {
+ CHECKBOX_COLUMN,
+ NAME_COLUMN,
+ TOTAL_COLUMNS
+};
enum
{
};
+LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset)
+{
+ LttvTracesetSelector * s;
+ LttvTraceSelector * trace;
+ LttvTracefileSelector * tracefile;
+ int i, j, nb_trace, nb_tracefile, nb_control, nb_per_cpu;
+ LttvTrace * trace_v;
+ LttTrace * t;
+ LttTracefile *tf;
+
+ s = lttv_traceset_selector_new(lttv_traceset_name(traceset));
+ nb_trace = lttv_traceset_number(traceset);
+ for(i=0;i<nb_trace;i++){
+ trace_v = lttv_traceset_get(traceset, i);
+ t = lttv_trace(trace_v);
+ trace = lttv_trace_selector_new(t);
+ lttv_traceset_selector_add(s, trace);
+ 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;
+
+ for(j = 0 ; j < nb_tracefile ; j++) {
+ if(j < nb_control)
+ tf = ltt_trace_control_tracefile_get(t, j);
+ else
+ tf = ltt_trace_per_cpu_tracefile_get(t, j - nb_control);
+ tracefile = lttv_tracefile_selector_new(tf);
+ lttv_trace_selector_add(trace, tracefile);
+ }
+ }
+ return s;
+}
+
void
-insertViewTest(GtkMenuItem *menuitem, gpointer user_data)
+insert_viewer_wrap(GtkWidget *menuitem, gpointer user_data)
{
+ GdkWindow * win;
+ GdkCursor * new;
guint val = 20;
- insertView((GtkWidget*)menuitem, (view_constructor)user_data);
+ 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);
}
/* internal functions */
-void insertView(GtkWidget* widget, view_constructor constructor)
+void insert_viewer(GtkWidget* widget, view_constructor constructor)
{
- GtkCustom * custom;
- mainWindow * mwData;
+ GtkMultiVPaned * multi_vpaned;
+ MainWindow * mw_data;
GtkWidget * viewer;
+ LttvTracesetSelector * s;
+ unsigned * size;
+ TimeInterval * time_interval;
+ TimeWindow time_window;
- mwData = get_window_data_struct(widget);
- if(!mwData->CurrentTab) return;
- custom = mwData->CurrentTab->custom;
+ mw_data = get_window_data_struct(widget);
+ if(!mw_data->current_tab) return;
+ multi_vpaned = mw_data->current_tab->multi_vpaned;
- viewer = (GtkWidget*)constructor(mwData);
+ s = construct_traceset_selector(mw_data->current_tab->traceset_info->traceset);
+ viewer = (GtkWidget*)constructor(mw_data, s, "Traceset_Selector");
if(viewer)
{
- gtk_custom_widget_add(custom, viewer);
+ gtk_multi_vpaned_widget_add(multi_vpaned, viewer);
// 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){
+ 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);
+ set_current_time(mw_data,&(mw_data->current_tab->current_time));
}
}
strcpy(label,gtk_entry_get_text(entry));
}
-void get_label(GtkWindow * mw, gchar * str, gchar* dialogue_title, gchar * label_str)
+void get_label(MainWindow * mw, gchar * str, gchar* dialogue_title, gchar * label_str)
{
GtkWidget * dialogue;
GtkWidget * text;
}
}
-mainWindow * get_window_data_struct(GtkWidget * widget)
+MainWindow * get_window_data_struct(GtkWidget * widget)
{
GtkWidget * mw;
- mainWindow * mwData;
+ MainWindow * mw_data;
mw = lookup_widget(widget, "MWindow");
if(mw == NULL){
return;
}
- mwData = (mainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow");
- if(mwData == NULL){
+ mw_data = (MainWindow *) g_object_get_data(G_OBJECT(mw),"mainWindow");
+ if(mw_data == NULL){
g_printf("Main window data does not exist\n");
return;
}
- return mwData;
+ return mw_data;
}
-void createNewWindow(GtkWidget* widget, gpointer user_data, gboolean clone)
+void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone)
{
- mainWindow * parent = get_window_data_struct(widget);
+ MainWindow * parent = get_window_data_struct(widget);
if(clone){
g_printf("Clone : use the same traceset\n");
- constructMainWin(parent, NULL, FALSE);
+ construct_main_window(parent, NULL);
}else{
g_printf("Empty : traceset is set to NULL\n");
- constructMainWin(NULL, parent->winCreationData, FALSE);
+ construct_main_window(NULL, parent->win_creation_data);
}
}
void move_up_viewer(GtkWidget * widget, gpointer user_data)
{
- mainWindow * mw = get_window_data_struct(widget);
- if(!mw->CurrentTab) return;
- gtk_custom_widget_move_up(mw->CurrentTab->custom);
+ MainWindow * mw = get_window_data_struct(widget);
+ if(!mw->current_tab) return;
+ gtk_multi_vpaned_widget_move_up(mw->current_tab->multi_vpaned);
}
void move_down_viewer(GtkWidget * widget, gpointer user_data)
{
- mainWindow * mw = get_window_data_struct(widget);
- if(!mw->CurrentTab) return;
- gtk_custom_widget_move_down(mw->CurrentTab->custom);
+ MainWindow * mw = get_window_data_struct(widget);
+ if(!mw->current_tab) return;
+ gtk_multi_vpaned_widget_move_down(mw->current_tab->multi_vpaned);
}
void delete_viewer(GtkWidget * widget, gpointer user_data)
{
- mainWindow * mw = get_window_data_struct(widget);
- if(!mw->CurrentTab) return;
- gtk_custom_widget_delete(mw->CurrentTab->custom);
+ MainWindow * mw = get_window_data_struct(widget);
+ if(!mw->current_tab) return;
+ gtk_multi_vpaned_widget_delete(mw->current_tab->multi_vpaned);
}
void open_traceset(GtkWidget * widget, gpointer user_data)
char ** dir;
gint id;
LttvTraceset * traceset;
- mainWindow * mwData = get_window_data_struct(widget);
- GtkFileSelection * fileSelector =
+ MainWindow * mw_data = get_window_data_struct(widget);
+ GtkFileSelection * file_selector =
(GtkFileSelection *)gtk_file_selection_new("Select a traceset");
- gtk_file_selection_hide_fileop_buttons(fileSelector);
+ gtk_file_selection_hide_fileop_buttons(file_selector);
- id = gtk_dialog_run(GTK_DIALOG(fileSelector));
+ id = gtk_dialog_run(GTK_DIALOG(file_selector));
switch(id){
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
- dir = gtk_file_selection_get_selections (fileSelector);
+ dir = gtk_file_selection_get_selections (file_selector);
traceset = lttv_traceset_load(dir[0]);
g_printf("Open a trace set %s\n", dir[0]);
//Not finished yet
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
default:
- gtk_widget_destroy((GtkWidget*)fileSelector);
+ gtk_widget_destroy((GtkWidget*)file_selector);
break;
}
}
+void redraw_viewer(MainWindow * mw_data, TimeWindow * time_window, unsigned nb_events)
+{
+ //update time window of each viewer, let viewer insert hooks needed by process_traceset
+ set_time_window(mw_data, time_window);
+
+ process_traceset_api(mw_data, time_window->start_time,
+ ltt_time_add(time_window->start_time,time_window->time_width),
+ nb_events);
+
+ //call hooks to show each viewer and let them remove hooks
+ show_viewer(mw_data);
+}
+
+void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * t)
+{
+ int j, nb_tracefile, nb_control, nb_per_cpu;
+ LttvTracesetSelector * s;
+ LttvTraceSelector * trace;
+ LttvTracefileSelector * tracefile;
+ LttTracefile * tf;
+ GtkWidget * w;
+
+ 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);
+ 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;
+
+ for(j = 0 ; j < nb_tracefile ; j++) {
+ if(j < nb_control)
+ tf = ltt_trace_control_tracefile_get(t, j);
+ else
+ tf = ltt_trace_per_cpu_tracefile_get(t, j - nb_control);
+ tracefile = lttv_tracefile_selector_new(tf);
+ lttv_trace_selector_add(trace, tracefile);
+ }
+
+ w = gtk_multi_vpaned_get_next_widget(paned);
+ }
+}
+
void add_trace(GtkWidget * widget, gpointer user_data)
{
LttTrace *trace;
LttvTraceset * traceset;
char * dir;
gint id;
- mainWindow * mwData = get_window_data_struct(widget);
- GtkDirSelection * fileSelector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
- gtk_dir_selection_hide_fileop_buttons(fileSelector);
+ MainWindow * mw_data = get_window_data_struct(widget);
+ GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace");
+ gtk_dir_selection_hide_fileop_buttons(file_selector);
- id = gtk_dialog_run(GTK_DIALOG(fileSelector));
+ id = gtk_dialog_run(GTK_DIALOG(file_selector));
switch(id){
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
- dir = gtk_dir_selection_get_dir (fileSelector);
+ dir = gtk_dir_selection_get_dir (file_selector);
trace = ltt_trace_open(dir);
if(trace == NULL) g_critical("cannot open trace %s", dir);
trace_v = lttv_trace_new(trace);
- traceset = mwData->Traceset_Info->traceset;
- if(mwData->Traceset_Info->TracesetContext != NULL){
- lttv_context_fini(LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext));
- g_object_unref(mwData->Traceset_Info->TracesetContext);
+ traceset = mw_data->current_tab->traceset_info->traceset;
+ if(mw_data->current_tab->traceset_info->traceset_context != NULL){
+ lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->current_tab->
+ traceset_info->traceset_context));
+ g_object_unref(mw_data->current_tab->traceset_info->traceset_context);
}
lttv_traceset_add(traceset, trace_v);
- mwData->Traceset_Info->TracesetContext =
+ mw_data->current_tab->traceset_info->traceset_context =
g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
lttv_context_init(
- LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext),traceset);
+ LTTV_TRACESET_CONTEXT(mw_data->current_tab->traceset_info->
+ traceset_context),traceset);
+ add_trace_into_traceset_selector(mw_data->current_tab->multi_vpaned, trace);
+
+ gtk_widget_destroy((GtkWidget*)file_selector);
+
+ //update current tab
+ redraw_viewer(mw_data, &(mw_data->current_tab->time_window), G_MAXULONG);
+ set_current_time(mw_data,&(mw_data->current_tab->current_time));
+ break;
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
default:
- gtk_widget_destroy((GtkWidget*)fileSelector);
+ gtk_widget_destroy((GtkWidget*)file_selector);
break;
}
+}
- g_printf("add a trace to a trace set\n");
+void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i)
+{
+ LttvTracesetSelector * s;
+ LttvTraceSelector * t;
+ GtkWidget * w;
+
+ 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);
+ lttv_trace_selector_destroy(t);
+ w = gtk_multi_vpaned_get_next_widget(paned);
+ }
}
void remove_trace(GtkWidget * widget, gpointer user_data)
LttvTraceset * traceset;
gint i, nb_trace;
char ** name, *remove_trace_name;
- mainWindow * mwData = get_window_data_struct(widget);
+ MainWindow * mw_data = get_window_data_struct(widget);
+ LttvTracesetSelector * s;
+ LttvTraceSelector * t;
+ GtkWidget * w;
+ gboolean selected;
- nb_trace =lttv_traceset_number(mwData->Traceset_Info->traceset);
+ nb_trace =lttv_traceset_number(mw_data->current_tab->traceset_info->traceset);
name = g_new(char*,nb_trace);
for(i = 0; i < nb_trace; i++){
- trace_v = lttv_traceset_get(mwData->Traceset_Info->traceset, i);
+ trace_v = lttv_traceset_get(mw_data->current_tab->
+ traceset_info->traceset, i);
trace = lttv_trace(trace_v);
- name[i] = trace->pathname;
+ name[i] = ltt_trace_name(trace);
}
remove_trace_name = get_remove_trace(name, nb_trace);
if(remove_trace_name){
for(i=0; i<nb_trace; i++){
if(strcmp(remove_trace_name,name[i]) == 0){
- traceset = mwData->Traceset_Info->traceset;
- if(mwData->Traceset_Info->TracesetContext != NULL){
- lttv_context_fini(LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext));
- g_object_unref(mwData->Traceset_Info->TracesetContext);
+ //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);
+ 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);
+ selected = lttv_trace_selector_get_selected(t);
+ if(selected)break;
+ w = gtk_multi_vpaned_get_next_widget(mw_data->current_tab->multi_vpaned);
+ }
+
+ //if no viewer selects the trace, remove it
+ if(!selected){
+ remove_trace_from_traceset_selector(mw_data->current_tab->multi_vpaned, i);
+
+ traceset = mw_data->current_tab->traceset_info->traceset;
+ trace_v = lttv_traceset_get(traceset, i);
+ if(lttv_trace_get_ref_number(trace_v) <= 1)
+ ltt_trace_close(lttv_trace(trace_v));
+
+ if(mw_data->current_tab->traceset_info->traceset_context != NULL){
+ lttv_context_fini(LTTV_TRACESET_CONTEXT(mw_data->current_tab->
+ traceset_info->traceset_context));
+ g_object_unref(mw_data->current_tab->traceset_info->traceset_context);
+ }
+ lttv_traceset_remove(traceset, i);
+ lttv_trace_destroy(trace_v);
+ mw_data->current_tab->traceset_info->traceset_context =
+ g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+ lttv_context_init(
+ 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);
+ set_current_time(mw_data,&(mw_data->current_tab->current_time));
}
- lttv_traceset_remove(traceset, i);
- mwData->Traceset_Info->TracesetContext =
- g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
- lttv_context_init(
- LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext),traceset);
break;
}
}
}
g_free(name);
- g_printf("remove a trace from a trace set\n");
}
void save(GtkWidget * widget, gpointer user_data)
g_printf("Save as\n");
}
+void zoom(GtkWidget * widget, double size)
+{
+ TimeInterval *time_span;
+ TimeWindow time_window;
+ LttTime current_time, time_delta, time_s, time_e;
+ MainWindow * mw_data = get_window_data_struct(widget);
+
+ time_span = LTTV_TRACESET_CONTEXT(mw_data->current_tab->
+ traceset_info->traceset_context)->Time_Span;
+ time_window = mw_data->current_tab->time_window;
+ current_time = mw_data->current_tab->current_time;
+
+ time_delta = ltt_time_sub(time_span->endTime,time_span->startTime);
+ if(size == 0){
+ time_window.start_time = time_span->startTime;
+ time_window.time_width = time_delta;
+ }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_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));
+ 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_e = time_span->endTime;
+ time_s = ltt_time_sub(time_e,time_window.time_width);
+ }
+ time_window.start_time = time_s;
+ }
+ redraw_viewer(mw_data, &time_window, G_MAXULONG);
+ set_current_time(mw_data,&(mw_data->current_tab->current_time));
+ gtk_multi_vpaned_set_adjust(mw_data->current_tab->multi_vpaned, FALSE);
+}
+
void zoom_in(GtkWidget * widget, gpointer user_data)
{
- g_printf("Zoom in\n");
+ zoom(widget, 2);
}
void zoom_out(GtkWidget * widget, gpointer user_data)
{
- g_printf("Zoom out\n");
+ zoom(widget, 0.5);
}
void zoom_extended(GtkWidget * widget, gpointer user_data)
{
- g_printf("Zoom extended\n");
+ zoom(widget, 0);
}
void go_to_time(GtkWidget * widget, gpointer user_data)
on_empty_traceset_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- createNewWindow((GtkWidget*)menuitem, user_data, FALSE);
+ create_new_window((GtkWidget*)menuitem, user_data, FALSE);
}
on_clone_traceset_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- createNewWindow((GtkWidget*)menuitem, user_data, TRUE);
+ create_new_window((GtkWidget*)menuitem, user_data, TRUE);
}
gpointer user_data)
{
gchar label[PATH_LENGTH];
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
GtkNotebook * notebook = (GtkNotebook *)lookup_widget((GtkWidget*)menuitem, "MNotebook");
if(notebook == NULL){
g_printf("Notebook does not exist\n");
}
strcpy(label,"Page");
- get_label(NULL, label,"Get the name of the tab","Please input tab's name");
+ get_label(mw_data, label,"Get the name of the tab","Please input tab's name");
- create_tab ((GtkWidget*)menuitem, notebook, label);
+ create_tab (mw_data, mw_data, notebook, label);
}
on_close_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
- mainWindow_Destructor(mwData);
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+ main_window_destructor(mw_data);
}
{
int count = 0;
GtkWidget * notebook;
- tab * tmp;
- mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
+ Tab * tmp;
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook");
if(notebook == NULL){
g_printf("Notebook does not exist\n");
return;
}
- if(mwData->Tab == mwData->CurrentTab){
- // tmp = mwData->CurrentTab;
- // mwData->Tab = mwData->CurrentTab->Next;
+ if(mw_data->tab == mw_data->current_tab){
+ // tmp = mw_data->current_tb;
+ // mw_data->tab = mw_data->current_tab->next;
g_printf("The default TAB can not be deleted\n");
return;
}else{
- tmp = mwData->Tab;
- while(tmp != mwData->CurrentTab){
- tmp = tmp->Next;
+ tmp = mw_data->tab;
+ while(tmp != mw_data->current_tab){
+ tmp = tmp->next;
count++;
}
}
delete_viewer((GtkWidget*)menuitem, user_data);
}
+void
+on_trace_filter_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+ LttvTracesetSelector * s;
+ GtkWidget * w = gtk_multi_vpaned_get_widget(mw_data->current_tab->multi_vpaned);
+
+ s = g_object_get_data(G_OBJECT(w), "Traceset_Selector");
+ if(!s){
+ g_printf("There is no viewer yet\n");
+ return;
+ }
+ get_filter_selection(s, "Configure trace and tracefile filter", "Select traces and tracefiles");
+}
+
+void
+on_trace_facility_activate (GtkMenuItem *menuitem,
+ gpointer user_data)
+{
+ g_printf("Trace facility selector: %s\n");
+}
void
on_load_module_activate (GtkMenuItem *menuitem,
char ** dir;
gint id;
char str[PATH_LENGTH], *str1;
- mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
- GtkFileSelection * fileSelector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
- gtk_file_selection_hide_fileop_buttons(fileSelector);
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
+ GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module");
+ gtk_file_selection_hide_fileop_buttons(file_selector);
str[0] = '\0';
- id = gtk_dialog_run(GTK_DIALOG(fileSelector));
+ id = gtk_dialog_run(GTK_DIALOG(file_selector));
switch(id){
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
- dir = gtk_file_selection_get_selections (fileSelector);
+ dir = gtk_file_selection_get_selections (file_selector);
sprintf(str,dir[0]);
str1 = strrchr(str,'/');
if(str1)str1++;
str1 = strrchr(str,'\\');
str1++;
}
- if(mwData->winCreationData)
- lttv_module_load(str1, mwData->winCreationData->argc,mwData->winCreationData->argv);
+ if(mw_data->win_creation_data)
+ lttv_module_load(str1, mw_data->win_creation_data->argc,mw_data->win_creation_data->argv);
else
lttv_module_load(str1, 0,NULL);
- g_slist_foreach(Main_Window_List, insertMenuToolbarItem, NULL);
+ g_slist_foreach(g_main_window_list, insert_menu_toolbar_item, NULL);
g_strfreev(dir);
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
default:
- gtk_widget_destroy((GtkWidget*)fileSelector);
+ gtk_widget_destroy((GtkWidget*)file_selector);
break;
}
g_printf("Load module: %s\n", str);
char **name, *unload_module_name;
guint nb;
LttvModule ** modules, *module;
- mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
modules = lttv_module_list(&nb);
name = g_new(char*, nb);
on_add_module_search_path_activate (GtkMenuItem *menuitem,
gpointer user_data)
{
- GtkDirSelection * fileSelector = (GtkDirSelection *)gtk_dir_selection_new("Select module path");
+ GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select module path");
char * dir;
gint id;
- mainWindow * mwData = get_window_data_struct((GtkWidget*)menuitem);
+ MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem);
- id = gtk_dialog_run(GTK_DIALOG(fileSelector));
+ id = gtk_dialog_run(GTK_DIALOG(file_selector));
switch(id){
case GTK_RESPONSE_ACCEPT:
case GTK_RESPONSE_OK:
- dir = gtk_dir_selection_get_dir (fileSelector);
+ dir = gtk_dir_selection_get_dir (file_selector);
lttv_module_path_add(dir);
case GTK_RESPONSE_REJECT:
case GTK_RESPONSE_CANCEL:
default:
- gtk_widget_destroy((GtkWidget*)fileSelector);
+ gtk_widget_destroy((GtkWidget*)file_selector);
break;
}
}
on_button_new_clicked (GtkButton *button,
gpointer user_data)
{
- createNewWindow((GtkWidget*)button, user_data, FALSE);
+ create_new_window((GtkWidget*)button, user_data, FALSE);
}
on_MWindow_destroy (GtkObject *object,
gpointer user_data)
{
- mainWindow *Main_Window = (mainWindow*)user_data;
+ MainWindow *Main_Window = (MainWindow*)user_data;
- g_printf("There are : %d windows\n",g_slist_length(Main_Window_List));
+ g_printf("There are : %d windows\n",g_slist_length(g_main_window_list));
- gWinCount--;
- if(gWinCount == 0)
+ g_win_count--;
+ if(g_win_count == 0)
gtk_main_quit ();
}
guint page_num,
gpointer user_data)
{
- mainWindow * mw = get_window_data_struct((GtkWidget*)notebook);
- tab * Tab = mw->Tab;
+ MainWindow * mw = get_window_data_struct((GtkWidget*)notebook);
+ Tab * tab = mw->tab;
while(page_num){
- Tab = Tab->Next;
+ tab = tab->next;
page_num--;
}
- mw->CurrentTab = Tab;
+ mw->current_tab = tab;
+}
+
+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);
+ }
+
+}
+
+void update_filter(LttvTracesetSelector *s, GtkTreeStore *store )
+{
+ GtkTreeIter iter, child_iter;
+ int i, j;
+ LttvTraceSelector * trace;
+ LttvTracefileSelector * tracefile;
+ gboolean value, value1;
+
+ if(gtk_tree_model_get_iter_first((GtkTreeModel*)store, &iter)){
+ i = 0;
+ do{
+ trace = lttv_traceset_selector_get(s, i);
+ 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);
+ 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));
+ }
+}
+
+void 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;
+ int i, j, id, nb_trace, nb_tracefile;
+ LttvTraceSelector * trace;
+ LttvTracefileSelector * tracefile;
+ 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, 100);
+
+ 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_number(s);
+ for(i=0;i<nb_trace;i++){
+ trace = lttv_traceset_selector_get(s, i);
+ name = lttv_trace_selector_get_name(trace);
+ gtk_tree_store_append (store, &iter, NULL);
+ checked = lttv_trace_selector_get_selected(trace);
+ gtk_tree_store_set (store, &iter,
+ CHECKBOX_COLUMN,checked,
+ NAME_COLUMN,name,
+ -1);
+ nb_tracefile = lttv_trace_selector_number(trace);
+ for(j=0;j<nb_tracefile;j++){
+ tracefile = lttv_trace_selector_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);
+ gtk_tree_store_set (store, &child_iter,
+ CHECKBOX_COLUMN, checked,
+ NAME_COLUMN,name,
+ -1);
+ }
+ }
+
+ id = gtk_dialog_run(GTK_DIALOG(dialogue));
+ switch(id){
+ case GTK_RESPONSE_ACCEPT:
+ case GTK_RESPONSE_OK:
+ update_filter(s, store);
+ case GTK_RESPONSE_REJECT:
+ case GTK_RESPONSE_CANCEL:
+ default:
+ gtk_widget_destroy(dialogue);
+ break;
+ }
}
char * get_remove_trace(char ** all_trace_name, int nb_trace)
}
-void insertMenuToolbarItem(mainWindow * mw, gpointer user_data)
+void insert_menu_toolbar_item(MainWindow * mw, gpointer user_data)
{
int i;
GdkPixbuf *pixbuf;
view_constructor constructor;
LttvMenus * menu;
LttvToolbars * toolbar;
- lttv_menu_closure *menuItem;
- lttv_toolbar_closure *toolbarItem;
+ lttv_menu_closure *menu_item;
+ lttv_toolbar_closure *toolbar_item;
LttvAttributeValue value;
LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
- GtkWidget * ToolMenuTitle_menu, *insert_view, *pixmap, *tmp;
+ GtkWidget * tool_menu_title_menu, *insert_view, *pixmap, *tmp;
g_assert(lttv_iattribute_find_by_path(attributes,
"viewers/menu", LTTV_POINTER, &value));
if(menu){
for(i=0;i<menu->len;i++){
- menuItem = &g_array_index(menu, lttv_menu_closure, i);
- tmp = g_hash_table_lookup(mw->hash_menu_item, g_strdup(menuItem->menuText));
+ menu_item = &g_array_index(menu, lttv_menu_closure, i);
+ tmp = g_hash_table_lookup(mw->hash_menu_item, g_strdup(menu_item->menuText));
if(tmp)continue;
- constructor = menuItem->con;
- ToolMenuTitle_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
- insert_view = gtk_menu_item_new_with_mnemonic (menuItem->menuText);
+ constructor = menu_item->con;
+ tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu");
+ insert_view = gtk_menu_item_new_with_mnemonic (menu_item->menuText);
gtk_widget_show (insert_view);
- gtk_container_add (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
+ gtk_container_add (GTK_CONTAINER (tool_menu_title_menu), insert_view);
g_signal_connect ((gpointer) insert_view, "activate",
- G_CALLBACK (insertViewTest),
+ G_CALLBACK (insert_viewer_wrap),
constructor);
- g_hash_table_insert(mw->hash_menu_item, g_strdup(menuItem->menuText),
+ g_hash_table_insert(mw->hash_menu_item, g_strdup(menu_item->menuText),
insert_view);
}
}
if(toolbar){
for(i=0;i<toolbar->len;i++){
- toolbarItem = &g_array_index(toolbar, lttv_toolbar_closure, i);
- tmp = g_hash_table_lookup(mw->hash_toolbar_item, g_strdup(toolbarItem->tooltip));
+ toolbar_item = &g_array_index(toolbar, lttv_toolbar_closure, i);
+ tmp = g_hash_table_lookup(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip));
if(tmp)continue;
- constructor = toolbarItem->con;
- ToolMenuTitle_menu = lookup_widget(mw->MWindow,"MToolbar2");
- pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbarItem->pixmap);
+ constructor = toolbar_item->con;
+ tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar2");
+ pixbuf = gdk_pixbuf_new_from_xpm_data ((const char**)toolbar_item->pixmap);
pixmap = gtk_image_new_from_pixbuf(pixbuf);
- insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (ToolMenuTitle_menu),
+ insert_view = gtk_toolbar_append_element (GTK_TOOLBAR (tool_menu_title_menu),
GTK_TOOLBAR_CHILD_BUTTON,
NULL,
"",
- toolbarItem->tooltip, NULL,
+ toolbar_item->tooltip, NULL,
pixmap, NULL, NULL);
- gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (ToolMenuTitle_menu)->children)->data))->label), TRUE);
+ gtk_label_set_use_underline (GTK_LABEL (((GtkToolbarChild*) (g_list_last (GTK_TOOLBAR (tool_menu_title_menu)->children)->data))->label), TRUE);
gtk_widget_show (insert_view);
gtk_container_set_border_width (GTK_CONTAINER (insert_view), 1);
- g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insertViewTest),constructor);
- g_hash_table_insert(mw->hash_toolbar_item, g_strdup(toolbarItem->tooltip),
+ g_signal_connect ((gpointer) insert_view, "clicked",G_CALLBACK (insert_viewer_wrap),constructor);
+ g_hash_table_insert(mw->hash_toolbar_item, g_strdup(toolbar_item->tooltip),
insert_view);
}
}
}
-void constructMainWin(mainWindow * parent, WindowCreationData * win_creation_data,
- gboolean first_window)
+void construct_main_window(MainWindow * parent, WindowCreationData * win_creation_data)
{
- g_critical("constructMainWin()");
- GtkWidget * newWindow; /* New generated main window */
- mainWindow * newMWindow;/* New main window structure */
+ g_critical("construct_main_window()");
+ GtkWidget * new_window; /* New generated main window */
+ MainWindow * new_m_window;/* New main window structure */
GtkNotebook * notebook;
LttvIAttribute *attributes =
LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
LttvAttributeValue value;
- newMWindow = g_new(mainWindow, 1);
+ new_m_window = g_new(MainWindow, 1);
// Add the object's information to the module's array
- Main_Window_List = g_slist_append(Main_Window_List, newMWindow);
+ g_main_window_list = g_slist_append(g_main_window_list, new_m_window);
- newWindow = create_MWindow();
- gtk_widget_show (newWindow);
+ new_window = create_MWindow();
+ gtk_widget_show (new_window);
- newMWindow->Attributes = attributes;
+ new_m_window->attributes = attributes;
- newMWindow->Traceset_Info = g_new(TracesetInfo,1);
- newMWindow->Traceset_Info->path = NULL ;
-
-
- newMWindow->Traceset_Info->before_traceset = lttv_hooks_new();
- newMWindow->Traceset_Info->after_traceset = lttv_hooks_new();
- newMWindow->Traceset_Info->before_trace = lttv_hooks_new();
- newMWindow->Traceset_Info->after_trace = lttv_hooks_new();
- newMWindow->Traceset_Info->before_tracefile = lttv_hooks_new();
- newMWindow->Traceset_Info->after_tracefile = lttv_hooks_new();
- newMWindow->Traceset_Info->before_event = lttv_hooks_new();
- newMWindow->Traceset_Info->after_event = lttv_hooks_new();
-
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/before",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->before_traceset;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/traceset/after",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->after_traceset;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/before",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->before_trace;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/trace/after",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->after_trace;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/before",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->before_tracefile;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/tracefile/after",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->after_tracefile;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/before",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->before_event;
- g_assert(lttv_iattribute_find_by_path(attributes, "hooks/event/after",
- LTTV_POINTER, &value));
- *(value.v_pointer) = newMWindow->Traceset_Info->after_event;
-
-
- newMWindow->MWindow = newWindow;
- newMWindow->Tab = NULL;
- newMWindow->CurrentTab = NULL;
- newMWindow->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+ new_m_window->mwindow = new_window;
+ new_m_window->tab = NULL;
+ new_m_window->current_tab = NULL;
+ new_m_window->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
if(parent){
- newMWindow->Traceset_Info->traceset =
- lttv_traceset_copy(parent->Traceset_Info->traceset);
-
-//FIXME copy not implemented in lower level
- newMWindow->Traceset_Info->TracesetContext =
- g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
- lttv_context_init(
- LTTV_TRACESET_CONTEXT(newMWindow->Traceset_Info->TracesetContext),
- newMWindow->Traceset_Info->traceset);
- //newMWindow->traceset_context = parent->traceset_context;
- newMWindow->winCreationData = parent->winCreationData;
+ new_m_window->win_creation_data = parent->win_creation_data;
}else{
- newMWindow->Traceset_Info->traceset = lttv_traceset_new();
-
- /* Add the command line trace */
- if(gInit_Trace != NULL && first_window)
- lttv_traceset_add(newMWindow->Traceset_Info->traceset, gInit_Trace);
- /* NOTE : the context must be recreated if we change the traceset,
- * ie : adding/removing traces */
- newMWindow->Traceset_Info->TracesetContext =
- g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
- lttv_context_init(
- LTTV_TRACESET_CONTEXT(newMWindow->Traceset_Info->TracesetContext),
- newMWindow->Traceset_Info->traceset);
-
- newMWindow->winCreationData = win_creation_data;
+ new_m_window->win_creation_data = win_creation_data;
}
- newMWindow->hash_menu_item = g_hash_table_new_full (g_str_hash, g_str_equal,
+ new_m_window->hash_menu_item = g_hash_table_new_full (g_str_hash, g_str_equal,
main_window_destroy_hash_key,
main_window_destroy_hash_data);
- newMWindow->hash_toolbar_item = g_hash_table_new_full (g_str_hash, g_str_equal,
+ new_m_window->hash_toolbar_item = g_hash_table_new_full (g_str_hash, g_str_equal,
main_window_destroy_hash_key,
main_window_destroy_hash_data);
- insertMenuToolbarItem(newMWindow, NULL);
+ insert_menu_toolbar_item(new_m_window, NULL);
- g_object_set_data(G_OBJECT(newWindow), "mainWindow", (gpointer)newMWindow);
+ g_object_set_data(G_OBJECT(new_window), "mainWindow", (gpointer)new_m_window);
//create a default tab
- notebook = (GtkNotebook *)lookup_widget(newMWindow->MWindow, "MNotebook");
+ notebook = (GtkNotebook *)lookup_widget(new_m_window->mwindow, "MNotebook");
if(notebook == NULL){
g_printf("Notebook does not exist\n");
return;
}
//for now there is no name field in LttvTraceset structure
//Use "Traceset" as the label for the default tab
- create_tab(newMWindow->MWindow, notebook,"Traceset");
+ create_tab(NULL, new_m_window, notebook,"Traceset");
g_object_set_data_full(
- G_OBJECT(newMWindow->MWindow),
+ G_OBJECT(new_m_window->mwindow),
"Main_Window_Data",
- newMWindow,
- (GDestroyNotify)mainWindow_free);
+ new_m_window,
+ (GDestroyNotify)main_window_free);
- gWinCount++;
+ g_win_count++;
}
-void Tab_Destructor(tab *Tab)
+void tab_destructor(Tab * tab_instance)
{
- if(Tab->Attributes)
- g_object_unref(Tab->Attributes);
+ int i, nb, ref_count;
+ LttvTrace * trace;
- if(Tab->mw->Tab == Tab){
- Tab->mw->Tab = Tab->Next;
+ if(tab_instance->attributes)
+ g_object_unref(tab_instance->attributes);
+
+ if(tab_instance->mw->tab == tab_instance){
+ tab_instance->mw->tab = tab_instance->next;
}else{
- tab * tmp1, *tmp = Tab->mw->Tab;
- while(tmp != Tab){
+ Tab * tmp1, *tmp = tab_instance->mw->tab;
+ while(tmp != tab_instance){
tmp1 = tmp;
- tmp = tmp->Next;
+ tmp = tmp->next;
}
- tmp1->Next = Tab->Next;
+ tmp1->next = tab_instance->next;
+ }
+
+ if(tab_instance->traceset_info->traceset_context != NULL){
+ lttv_context_fini(LTTV_TRACESET_CONTEXT(tab_instance->traceset_info->
+ traceset_context));
+ g_object_unref(tab_instance->traceset_info->traceset_context);
}
- g_free(Tab);
+ if(tab_instance->traceset_info->traceset != NULL) {
+ nb = lttv_traceset_number(tab_instance->traceset_info->traceset);
+ for(i = 0 ; i < nb ; i++) {
+ trace = lttv_traceset_get(tab_instance->traceset_info->traceset, i);
+ ref_count = lttv_trace_get_ref_number(trace);
+ if(ref_count <= 1){
+ ltt_trace_close(lttv_trace(trace));
+ }
+ lttv_trace_destroy(trace);
+ }
+ }
+ lttv_traceset_destroy(tab_instance->traceset_info->traceset);
+ g_free(tab_instance->traceset_info);
+ g_free(tab_instance);
}
-void * create_tab(GtkWidget* parent, GtkNotebook * notebook, char * label)
+void * create_tab(MainWindow * parent, MainWindow* current_window,
+ GtkNotebook * notebook, char * label)
{
GList * list;
- tab * tmpTab;
- mainWindow * mwData;
- LttTime TmpTime;
-
- mwData = get_window_data_struct(parent);
- tmpTab = mwData->Tab;
- while(tmpTab && tmpTab->Next) tmpTab = tmpTab->Next;
- if(!tmpTab){
- mwData->CurrentTab = NULL;
- tmpTab = g_new(tab,1);
- mwData->Tab = tmpTab;
+ Tab * tmp_tab;
+ MainWindow * mw_data = current_window;
+ LttTime tmp_time;
+
+ tmp_tab = mw_data->tab;
+ while(tmp_tab && tmp_tab->next) tmp_tab = tmp_tab->next;
+ if(!tmp_tab){
+ mw_data->current_tab = NULL;
+ tmp_tab = g_new(Tab,1);
+ mw_data->tab = tmp_tab;
+ }else{
+ tmp_tab->next = g_new(Tab,1);
+ tmp_tab = tmp_tab->next;
+ }
+
+ tmp_tab->traceset_info = g_new(TracesetInfo,1);
+ if(parent){
+ tmp_tab->traceset_info->traceset =
+ lttv_traceset_copy(parent->current_tab->traceset_info->traceset);
}else{
- tmpTab->Next = g_new(tab,1);
- tmpTab = tmpTab->Next;
+ if(mw_data->current_tab){
+ tmp_tab->traceset_info->traceset =
+ lttv_traceset_copy(mw_data->current_tab->traceset_info->traceset);
+ }else{
+ tmp_tab->traceset_info->traceset = lttv_traceset_new();
+ /* Add the command line trace */
+ if(g_init_trace != NULL)
+ lttv_traceset_add(tmp_tab->traceset_info->traceset, g_init_trace);
+ }
}
- if(mwData->CurrentTab){
- // Will have to read directly at the main window level, as we want
- // to be able to modify a traceset on the fly.
- // tmpTab->traceStartTime = mwData->CurrentTab->traceStartTime;
- // tmpTab->traceEndTime = mwData->CurrentTab->traceEndTime;
- tmpTab->Time_Window = mwData->CurrentTab->Time_Window;
- tmpTab->currentTime = mwData->CurrentTab->currentTime;
+ //FIXME copy not implemented in lower level
+ tmp_tab->traceset_info->traceset_context =
+ g_object_new(LTTV_TRACESET_STATS_TYPE, NULL);
+ lttv_context_init(
+ LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context),
+ tmp_tab->traceset_info->traceset);
+
+ if(mw_data->current_tab){
+ // Will have to read directly at the main window level, as we want
+ // to be able to modify a traceset on the fly.
+ tmp_tab->time_window = mw_data->current_tab->time_window;
+ tmp_tab->current_time = mw_data->current_tab->current_time;
}else{
- // Will have to read directly at the main window level, as we want
- // to be able to modify a traceset on the fly.
- // getTracesetTimeSpan(mwData,&tmpTab->traceStartTime, &tmpTab->traceEndTime);
- tmpTab->Time_Window.startTime =
- LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext)->Time_Span->startTime;
+ // Will have to read directly at the main window level, as we want
+ // to be able to modify a traceset on the fly.
+ // get_traceset_time_span(mw_data,&tmp_tab->traceStartTime, &tmp_tab->traceEndTime);
+ tmp_tab->time_window.start_time =
+ LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->startTime;
if(DEFAULT_TIME_WIDTH_S <
- LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec)
- TmpTime.tv_sec = DEFAULT_TIME_WIDTH_S;
+ LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->Time_Span->endTime.tv_sec)
+ tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S;
else
- TmpTime.tv_sec =
- LTTV_TRACESET_CONTEXT(mwData->Traceset_Info->TracesetContext)->Time_Span->endTime.tv_sec;
- TmpTime.tv_nsec = 0;
- tmpTab->Time_Window.Time_Width = TmpTime ;
- tmpTab->currentTime.tv_sec = TmpTime.tv_sec / 2;
- tmpTab->currentTime.tv_nsec = 0 ;
+ tmp_time.tv_sec =
+ 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 ;
}
- tmpTab->Attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
- // mwData->CurrentTab = tmpTab;
- tmpTab->custom = (GtkCustom*)gtk_custom_new();
- tmpTab->custom->mw = mwData;
- gtk_widget_show((GtkWidget*)tmpTab->custom);
- tmpTab->Next = NULL;
- tmpTab->mw = mwData;
+ tmp_tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL));
+ // mw_data->current_tab = tmp_tab;
+ tmp_tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new();
+ tmp_tab->multi_vpaned->mw = mw_data;
+ gtk_widget_show((GtkWidget*)tmp_tab->multi_vpaned);
+ tmp_tab->next = NULL;
+ tmp_tab->mw = mw_data;
- tmpTab->label = gtk_label_new (label);
- gtk_widget_show (tmpTab->label);
+ tmp_tab->label = gtk_label_new (label);
+ gtk_widget_show (tmp_tab->label);
g_object_set_data_full(
- G_OBJECT(tmpTab->custom),
+ G_OBJECT(tmp_tab->multi_vpaned),
"Tab_Info",
- tmpTab,
- (GDestroyNotify)Tab_Destructor);
+ tmp_tab,
+ (GDestroyNotify)tab_destructor);
- gtk_notebook_append_page(notebook, (GtkWidget*)tmpTab->custom, tmpTab->label);
+ gtk_notebook_append_page(notebook, (GtkWidget*)tmp_tab->multi_vpaned, tmp_tab->label);
list = gtk_container_get_children(GTK_CONTAINER(notebook));
gtk_notebook_set_current_page(notebook,g_list_length(list)-1);
}
void remove_menu_item(gpointer main_win, gpointer user_data)
{
- mainWindow * mw = (mainWindow *) main_win;
- lttv_menu_closure *menuItem = (lttv_menu_closure *)user_data;
- GtkWidget * ToolMenuTitle_menu, *insert_view;
+ MainWindow * mw = (MainWindow *) main_win;
+ lttv_menu_closure *menu_item = (lttv_menu_closure *)user_data;
+ GtkWidget * tool_menu_title_menu, *insert_view;
- ToolMenuTitle_menu = lookup_widget(mw->MWindow,"ToolMenuTitle_menu");
+ tool_menu_title_menu = lookup_widget(mw->mwindow,"ToolMenuTitle_menu");
insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_menu_item,
- menuItem->menuText);
+ menu_item->menuText);
if(insert_view){
- g_hash_table_remove(mw->hash_menu_item, menuItem->menuText);
- gtk_container_remove (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
+ g_hash_table_remove(mw->hash_menu_item, menu_item->menuText);
+ gtk_container_remove (GTK_CONTAINER (tool_menu_title_menu), insert_view);
}
}
void remove_toolbar_item(gpointer main_win, gpointer user_data)
{
- mainWindow * mw = (mainWindow *) main_win;
- lttv_toolbar_closure *toolbarItem = (lttv_toolbar_closure *)user_data;
- GtkWidget * ToolMenuTitle_menu, *insert_view;
+ MainWindow * mw = (MainWindow *) main_win;
+ lttv_toolbar_closure *toolbar_item = (lttv_toolbar_closure *)user_data;
+ GtkWidget * tool_menu_title_menu, *insert_view;
- ToolMenuTitle_menu = lookup_widget(mw->MWindow,"MToolbar2");
+ tool_menu_title_menu = lookup_widget(mw->mwindow,"MToolbar2");
insert_view = (GtkWidget*)g_hash_table_lookup(mw->hash_toolbar_item,
- toolbarItem->tooltip);
+ toolbar_item->tooltip);
if(insert_view){
- g_hash_table_remove(mw->hash_toolbar_item, toolbarItem->tooltip);
- gtk_container_remove (GTK_CONTAINER (ToolMenuTitle_menu), insert_view);
+ g_hash_table_remove(mw->hash_toolbar_item, toolbar_item->tooltip);
+ gtk_container_remove (GTK_CONTAINER (tool_menu_title_menu), insert_view);
}
}
{
int i;
LttvMenus * menu;
- lttv_menu_closure *menuItem;
+ lttv_menu_closure *menu_item;
LttvAttributeValue value;
LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
if(menu){
for(i=0;i<menu->len;i++){
- menuItem = &g_array_index(menu, lttv_menu_closure, i);
- if(menuItem->con != constructor) continue;
- if(Main_Window_List){
- g_slist_foreach(Main_Window_List, remove_menu_item, menuItem);
+ menu_item = &g_array_index(menu, lttv_menu_closure, i);
+ if(menu_item->con != constructor) continue;
+ if(g_main_window_list){
+ g_slist_foreach(g_main_window_list, remove_menu_item, menu_item);
}
break;
}
{
int i;
LttvToolbars * toolbar;
- lttv_toolbar_closure *toolbarItem;
+ lttv_toolbar_closure *toolbar_item;
LttvAttributeValue value;
LttvIAttribute *attributes = LTTV_IATTRIBUTE(lttv_global_attributes());
if(toolbar){
for(i=0;i<toolbar->len;i++){
- toolbarItem = &g_array_index(toolbar, lttv_toolbar_closure, i);
- if(toolbarItem->con != constructor) continue;
- if(Main_Window_List){
- g_slist_foreach(Main_Window_List, remove_toolbar_item, toolbarItem);
+ toolbar_item = &g_array_index(toolbar, lttv_toolbar_closure, i);
+ if(toolbar_item->con != constructor) continue;
+ if(g_main_window_list){
+ g_slist_foreach(g_main_window_list, remove_toolbar_item, toolbar_item);
}
break;
}
projects / lttv.git / blobdiff