X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=55ab82b1321dcdc74cf8b41601d8e5a89779b433;hb=6ea089620900a1e1353112b14ccb3b6df05a9883;hp=8a1f906cfb5f0f57782263d097938ef1824f8c34;hpb=47cd8a0916562272d1b0da947a2bc78cc021dd93;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 8a1f906c..55ab82b1 100644 --- a/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c +++ b/ltt/branches/poly/lttv/modules/gui/lttvwindow/lttvwindow/callbacks.c @@ -20,6 +20,9 @@ # include #endif +#include // for PATH_MAX +#include + #include #include "callbacks.h" @@ -38,10 +41,11 @@ #include #include #include +#include #include #include -#define PATH_LENGTH 256 + #define DEFAULT_TIME_WIDTH_S 1 extern LttvTrace *g_init_trace ; @@ -51,8 +55,8 @@ extern LttvTrace *g_init_trace ; extern GSList * g_main_window_list; /** MD : keep old directory. */ -static char remember_plugins_dir[PATH_LENGTH] = ""; -static char remember_trace_dir[PATH_LENGTH] = ""; +static char remember_plugins_dir[PATH_MAX] = ""; +static char remember_trace_dir[PATH_MAX] = ""; MainWindow * get_window_data_struct(GtkWidget * widget); @@ -60,7 +64,7 @@ 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); -void * create_tab(MainWindow * mw, Tab *copy_tab, +Tab* create_tab(MainWindow * mw, Tab *copy_tab, GtkNotebook * notebook, char * label); static void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor); @@ -72,7 +76,7 @@ void checkbox_changed(GtkTreeView *treeview, gpointer user_data); void remove_trace_from_traceset_selector(GtkMultiVPaned * paned, unsigned i); void add_trace_into_traceset_selector(GtkMultiVPaned * paned, LttTrace * trace); -void create_new_tab(GtkWidget* widget, gpointer user_data); +Tab *create_new_tab(GtkWidget* widget, gpointer user_data); LttvTracesetSelector * construct_traceset_selector(LttvTraceset * traceset); @@ -165,14 +169,18 @@ void insert_viewer(GtkWidget* widget, lttvwindow_viewer_constructor constructor) { GtkMultiVPaned * multi_vpaned; MainWindow * mw_data = get_window_data_struct(widget); + GtkWidget * notebook = lookup_widget(widget, "MNotebook"); GtkWidget * viewer; LttvTracesetSelector * s; TimeInterval * time_interval; - Tab *tab = mw_data->current_tab; - - if(!tab) { - create_new_tab(widget, NULL); - tab = mw_data->current_tab; + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); + Tab *tab; + + if(!page) { + tab = create_new_tab(widget, NULL); + } else { + tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } multi_vpaned = tab->multi_vpaned; @@ -294,15 +302,38 @@ void create_new_window(GtkWidget* widget, gpointer user_data, gboolean clone) void move_up_viewer(GtkWidget * widget, gpointer user_data) { MainWindow * mw = get_window_data_struct(widget); - if(!mw->current_tab) return; - gtk_multi_vpaned_widget_move_up(mw->current_tab->multi_vpaned); + GtkWidget * notebook = lookup_widget(widget, "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"); + } + + gtk_multi_vpaned_widget_move_up(tab->multi_vpaned); } void move_down_viewer(GtkWidget * widget, gpointer user_data) { MainWindow * mw = get_window_data_struct(widget); - if(!mw->current_tab) return; - gtk_multi_vpaned_widget_move_down(mw->current_tab->multi_vpaned); + GtkWidget * notebook = lookup_widget(widget, "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"); + } + + gtk_multi_vpaned_widget_move_down(tab->multi_vpaned); } @@ -312,8 +343,19 @@ void move_down_viewer(GtkWidget * widget, gpointer user_data) void delete_viewer(GtkWidget * widget, gpointer user_data) { MainWindow * mw = get_window_data_struct(widget); - if(!mw->current_tab) return; - gtk_multi_vpaned_widget_delete(mw->current_tab->multi_vpaned); + GtkWidget * notebook = lookup_widget(widget, "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"); + } + + gtk_multi_vpaned_widget_delete(tab->multi_vpaned); } @@ -375,6 +417,7 @@ void open_traceset(GtkWidget * widget, gpointer user_data) * */ +#define list_out tab->events_requests gboolean lttvwindow_process_pending_requests(Tab *tab) { @@ -384,22 +427,17 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) GtkWidget* widget; LttvTracesetContext *tsc; LttvTracefileContext *tfc; - GSList *events_requests = tab->events_requests; - GSList *list_out = events_requests; GSList *list_in = NULL; LttTime end_time; guint end_nb_events; guint count; LttvTracesetContextPosition *end_position; - - /* Current tab check : if no current tab is present, no hooks to call. */ - /* (Xang Xiu) It makes the expose works.. MD:? */ if(tab == NULL) return FALSE; /* There is no events requests pending : we should never have been called! */ - g_assert(g_slist_length(events_requests) != 0); + g_assert(g_slist_length(list_out) != 0); tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); @@ -412,12 +450,48 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) gdk_window_stick(win); gdk_window_unstick(win); - g_debug("SIZE events req len : %d", g_slist_length(events_requests)); + g_debug("SIZE events req len : %d", g_slist_length(list_out)); + + /* Preliminary check for no trace in traceset */ + /* Unregister the routine if empty, empty list_out too */ + if(lttv_traceset_number(tsc->ts) == 0) { + + /* - For each req in list_out */ + GSList *iter = list_out; + + while(iter != NULL) { + + gboolean remove = FALSE; + gboolean free_data = FALSE; + EventsRequest *events_request = (EventsRequest *)iter->data; + + /* - Call end request for req */ + if(events_request->servicing == TRUE) + lttv_hooks_call(events_request->after_request, (gpointer)tsc); + + /* - remove req from list_out */ + /* Destroy the request */ + remove = TRUE; + free_data = TRUE; + + /* Go to next */ + if(remove) + { + GSList *remove_iter = iter; + + iter = g_slist_next(iter); + if(free_data) g_free(remove_iter->data); + list_out = g_slist_remove_link(list_out, remove_iter); + } else { // not remove + iter = g_slist_next(iter); + } + } + } /* Events processing algorithm implementation */ /* A. Servicing loop */ - while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0) - && !gtk_events_pending() ) { + while( (g_slist_length(list_in) != 0 || g_slist_length(list_out) != 0)) { + /* && !gtk_events_pending() ) */ /* 1. If list_in is empty (need a seek) */ if( g_slist_length(list_in) == 0 ) { @@ -504,9 +578,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) EventsRequest *event_request_lpos = (EventsRequest*)iter->data; - g_slist_append(list_in, event_request_lpos); + list_in = g_slist_append(list_in, event_request_lpos); /* Remove from list_out */ - g_slist_remove(list_out, event_request_lpos); + list_out = g_slist_remove(list_out, event_request_lpos); } } } else { @@ -518,9 +592,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) EventsRequest *event_request_ltime = (EventsRequest*)iter->data; - g_slist_append(list_in, event_request_ltime); + list_in = g_slist_append(list_in, event_request_ltime); /* Remove from list_out */ - g_slist_remove(list_out, event_request_ltime); + list_out = g_slist_remove(list_out, event_request_ltime); } } } @@ -533,22 +607,49 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) tfc = lttv_traceset_context_get_current_tfc(tsc); g_assert(g_slist_length(list_in)>0); EventsRequest *events_request = g_slist_nth_data(list_in, 0); + guint seek_count; /* 1.2.1 If first request in list_in is a time request */ if(events_request->start_position == NULL) { /* - If first req in list_in start time != current time */ - if(tfc != NULL && ltt_time_compare(events_request->start_time, + if(tfc == NULL || ltt_time_compare(events_request->start_time, tfc->timestamp) != 0) /* - Seek to that time */ - lttv_process_traceset_seek_time(tsc, events_request->start_time); + g_debug("SEEK TIME : %lu, %lu", events_request->start_time.tv_sec, + events_request->start_time.tv_nsec); + //lttv_process_traceset_seek_time(tsc, events_request->start_time); + lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc), + events_request->start_time); + + /* Process the traceset with only state hooks */ + seek_count = + lttv_process_traceset_middle(tsc, + events_request->start_time, + G_MAXUINT, NULL); + + } else { + LttTime pos_time; /* Else, the first request in list_in is a position request */ /* If first req in list_in pos != current pos */ g_assert(events_request->start_position != NULL); if(lttv_traceset_context_ctx_pos_compare(tsc, events_request->start_position) != 0) { /* 1.2.2.1 Seek to that position */ - lttv_process_traceset_seek_position(tsc, events_request->start_position); + g_debug("SEEK POSITION"); + //lttv_process_traceset_seek_position(tsc, events_request->start_position); + pos_time = lttv_traceset_context_position_get_time(events_request->start_position); + lttv_state_traceset_seek_time_closest(LTTV_TRACESET_STATE(tsc), + pos_time); + + /* Process the traceset with only state hooks */ + seek_count = + lttv_process_traceset_middle(tsc, + ltt_time_infinite, + G_MAXUINT, + events_request->start_position); + + } } } @@ -564,7 +665,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* - begin request hooks called * - servicing = TRUE */ - lttv_hooks_call(events_request->before_request, NULL); + lttv_hooks_call(events_request->before_request, (gpointer)tsc); events_request->servicing = TRUE; } /* 1.3.2 call before chunk @@ -579,43 +680,67 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } } else { /* 2. Else, list_in is not empty, we continue a read */ - GSList *iter = NULL; - tfc = lttv_traceset_context_get_current_tfc(tsc); + + { + /* 2.0 For each req of list_in */ + GSList *iter = list_in; - /* 2.1 For each req of list_out */ - for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) { - EventsRequest *events_request = (EventsRequest*)iter->data; + while(iter != NULL) { - /* if req.start time == current context time - * or req.start position == current position*/ - if( ltt_time_compare(events_request->start_time, - tfc->timestamp) == 0 - || - (events_request->start_position != NULL - && - lttv_traceset_context_ctx_pos_compare(tsc, - events_request->start_position) == 0) - ) { - /* - Add to list_in, remove from list_out */ - g_slist_append(list_in, events_request); - g_slist_remove(list_out, events_request); - - /* - If !servicing */ - if(events_request->servicing == FALSE) { - /* - begin request hooks called - * - servicing = TRUE - */ - lttv_hooks_call(events_request->before_request, NULL); - events_request->servicing = TRUE; - } - /* call before chunk - * events hooks added + EventsRequest *events_request = (EventsRequest *)iter->data; + + /* - Call before chunk + * - events hooks added */ lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, - events_request->before_chunk_trace, - events_request->before_chunk_tracefile, - events_request->event, - events_request->event_by_id); + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + + iter = g_slist_next(iter); + } + } + + { + GSList *iter = NULL; + tfc = lttv_traceset_context_get_current_tfc(tsc); + + /* 2.1 For each req of list_out */ + for(iter=list_out;iter!=NULL;iter=g_slist_next(iter)) { + EventsRequest *events_request = (EventsRequest*)iter->data; + + /* if req.start time == current context time + * or req.start position == current position*/ + if( ltt_time_compare(events_request->start_time, + tfc->timestamp) == 0 + || + (events_request->start_position != NULL + && + lttv_traceset_context_ctx_pos_compare(tsc, + events_request->start_position) == 0) + ) { + /* - Add to list_in, remove from list_out */ + list_in = g_slist_append(list_in, events_request); + list_out = g_slist_remove(list_out, events_request); + + /* - If !servicing */ + if(events_request->servicing == FALSE) { + /* - begin request hooks called + * - servicing = TRUE + */ + lttv_hooks_call(events_request->before_request, (gpointer)tsc); + events_request->servicing = TRUE; + } + /* call before chunk + * events hooks added + */ + lttv_process_traceset_begin(tsc, events_request->before_chunk_traceset, + events_request->before_chunk_trace, + events_request->before_chunk_tracefile, + events_request->event, + events_request->event_by_id); + } } } } @@ -702,7 +827,13 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) { /* 4. Call process traceset middle */ + g_critical("Calling process traceset middle with %p, %lu sec %lu nsec, %lu nb ev, %p end pos", tsc, end_time.tv_sec, end_time.tv_nsec, end_nb_events, end_position); count = lttv_process_traceset_middle(tsc, end_time, end_nb_events, end_position); + + tfc = lttv_traceset_context_get_current_tfc(tsc); + g_critical("Context time after middle : %lu, %lu", tfc->timestamp.tv_sec, + tfc->timestamp.tv_nsec); + } { /* 5. After process traceset middle */ @@ -729,7 +860,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->event, events_request->event_by_id); /* - Call end request for req */ - lttv_hooks_call(events_request->after_request, NULL); + lttv_hooks_call(events_request->after_request, (gpointer)tsc); /* - remove req from list_in */ /* Destroy the request */ @@ -749,7 +880,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } } } - { /* 5.1 For each req in list_in */ GSList *iter = list_in; @@ -776,7 +906,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) g_assert(tfc != NULL); /* - if req.num == 0 * or - * current context time > req.end time + * current context time >= req.end time * or * req.end pos == current pos * or @@ -787,7 +917,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->stop_flag == TRUE || ltt_time_compare(tfc->timestamp, - events_request->end_time) > 0 + events_request->end_time) >= 0 || (events_request->start_position != NULL && @@ -795,9 +925,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->start_position) != 0) ) { + g_assert(events_request->servicing == TRUE); /* - Call end request for req * - remove req from list_in */ - lttv_hooks_call(events_request->after_request, NULL); + lttv_hooks_call(events_request->after_request, (gpointer)tsc); /* - remove req from list_in */ /* Destroy the request */ remove = TRUE; @@ -818,6 +949,8 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } } } + + //if(gtk_events_pending()) break; } /* B. When interrupted between chunks */ @@ -833,7 +966,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) EventsRequest *events_request = (EventsRequest *)iter->data; /* 1.1. Use current postition as start position */ - g_free(events_request->start_position); + if(events_request->start_position != NULL) + lttv_traceset_context_position_destroy(events_request->start_position); + events_request->start_position = ltt_traceset_context_position_new(); lttv_traceset_context_position_save(tsc, events_request->start_position); /* 1.2. Remove start time */ @@ -866,14 +1001,18 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) g_assert(g_slist_length(list_in) == 0); + if( g_slist_length(list_out) == 0 ) { /* Put tab's request pending flag back to normal */ tab->events_request_pending = FALSE; + g_critical("remove the idle fct"); return FALSE; /* Remove the idle function */ } + g_critical("leave the idle fct"); return TRUE; /* Leave the idle function */ } +#undef list_out /* add_trace_into_traceset_selector, each instance of a viewer has an associated @@ -937,6 +1076,14 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v) LttvTraceset *traceset = tab->traceset_info->traceset; guint i; + //Verify if trace is already present. + for(i=0; itraceset_info->traceset_context); lttv_traceset_add(traceset, trace_v); + lttv_trace_ref(trace_v); /* local ref */ /* Create new context */ tab->traceset_info->traceset_context = @@ -961,6 +1109,38 @@ static void lttvwindow_add_trace(Tab *tab, LttvTrace *trace_v) LTTV_TRACESET_CONTEXT(tab->traceset_info-> traceset_context), traceset); + + /* Set the tab's time window and current time if currently 0, 0 */ + if(tab->time_window.start_time.tv_sec == 0 && + tab->time_window.start_time.tv_nsec == 0) + tab->time_window.start_time = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.start_time; + if(tab->time_window.time_width.tv_sec == 0 && + tab->time_window.time_width.tv_nsec == 0) { + LttTime tmp_time; + + if(DEFAULT_TIME_WIDTH_S < + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.end_time.tv_sec) + tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S; + else + tmp_time.tv_sec = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.end_time.tv_sec; + tmp_time.tv_nsec = 0; + tab->time_window.time_width = tmp_time ; + } + if(tab->current_time.tv_sec == 0 && tab->current_time.tv_nsec == 0) { + tab->current_time.tv_sec = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.start_time.tv_sec; + tab->current_time.tv_nsec = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.start_time.tv_nsec; + } + + //add state update hooks lttv_state_add_event_hooks( (LttvTracesetState*)tab->traceset_info->traceset_context); @@ -985,19 +1165,25 @@ void add_trace(GtkWidget * widget, gpointer user_data) LttvTrace * trace_v; LttvTraceset * traceset; const char * dir; + char abs_path[PATH_MAX]; gint id; gint i; MainWindow * mw_data = get_window_data_struct(widget); - Tab *tab = mw_data->current_tab; + GtkWidget * notebook = lookup_widget(widget, "MNotebook"); + + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); + Tab *tab; + + if(!page) { + tab = create_new_tab(widget, NULL); + } else { + tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); + } GtkDirSelection * file_selector = (GtkDirSelection *)gtk_dir_selection_new("Select a trace"); gtk_dir_selection_hide_fileop_buttons(file_selector); - if(!tab) { - create_new_tab(widget, NULL); - tab = mw_data->current_tab; - } - if(remember_trace_dir[0] != '\0') gtk_dir_selection_set_filename(file_selector, remember_trace_dir); @@ -1006,16 +1192,25 @@ void add_trace(GtkWidget * widget, gpointer user_data) case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_OK: dir = gtk_dir_selection_get_dir (file_selector); - strncpy(remember_trace_dir, dir, PATH_LENGTH); + strncpy(remember_trace_dir, dir, PATH_MAX); if(!dir || strlen(dir) == 0){ gtk_widget_destroy((GtkWidget*)file_selector); break; } - trace = ltt_trace_open(dir); - if(trace == NULL) g_critical("cannot open trace %s", dir); - trace_v = lttv_trace_new(trace); - - lttvwindow_add_trace(tab, trace_v); + get_absolute_pathname(dir, abs_path); + trace_v = lttvwindowtraces_get_trace_by_name(abs_path); + if(trace_v == NULL) { + trace = ltt_trace_open(abs_path); + if(trace == NULL) { + g_warning("cannot open trace %s", abs_path); + } else { + trace_v = lttv_trace_new(trace); + lttvwindowtraces_add_trace(trace_v); + lttvwindow_add_trace(tab, trace_v); + } + } else { + lttvwindow_add_trace(tab, trace_v); + } gtk_widget_destroy((GtkWidget*)file_selector); @@ -1080,14 +1275,22 @@ void remove_trace(GtkWidget * widget, gpointer user_data) gint i, j, nb_trace; char ** name, *remove_trace_name; MainWindow * mw_data = get_window_data_struct(widget); - Tab *tab = mw_data->current_tab; LttvTracesetSelector * s; LttvTraceSelector * t; GtkWidget * w; gboolean selected; - - if(!tab) return; - + GtkWidget * notebook = lookup_widget(widget, "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"); + } + nb_trace =lttv_traceset_number(tab->traceset_info->traceset); name = g_new(char*,nb_trace); for(i = 0; i < nb_trace; i++){ @@ -1101,90 +1304,95 @@ void remove_trace(GtkWidget * widget, gpointer user_data) if(remove_trace_name){ for(i=0; imulti_vpaned); - if(w){ - s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); - if(s){ - 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(tab->multi_vpaned); - while(w){ - s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); - if(s){ - 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(tab->multi_vpaned); - } - }else selected = FALSE; + //unselect the trace from the current viewer + w = gtk_multi_vpaned_get_widget(tab->multi_vpaned); + if(w){ + s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); + if(s){ + 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(tab->multi_vpaned); + while(w){ + s = g_object_get_data(G_OBJECT(w), "Traceset_Selector"); + if(s){ + 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(tab->multi_vpaned); + } + }else selected = FALSE; - //if no viewer selects the trace, remove it - if(!selected){ - remove_trace_from_traceset_selector(tab->multi_vpaned, i); + //if no viewer selects the trace, remove it + if(!selected){ + remove_trace_from_traceset_selector(tab->multi_vpaned, i); - traceset = 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)); + traceset = tab->traceset_info->traceset; + //Keep a reference to the traces so they are not freed. + for(j=0; jtraceset_info->traceset_context); + lttv_context_fini(LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)); + g_object_unref(tab->traceset_info->traceset_context); - //remove state update hooks - lttv_state_remove_event_hooks( - (LttvTracesetState*)tab->traceset_info->traceset_context); - lttv_context_fini(LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)); - g_object_unref(tab->traceset_info->traceset_context); - - lttv_traceset_remove(traceset, i); - lttv_trace_unref(trace_v); // Remove local reference - if(!lttv_trace_get_ref_number(trace_v)) - lttv_trace_destroy(trace_v); - - tab->traceset_info->traceset_context = - g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); - lttv_context_init( - LTTV_TRACESET_CONTEXT(tab-> - traceset_info->traceset_context),traceset); - //add state update hooks - lttv_state_add_event_hooks( - (LttvTracesetState*)tab->traceset_info->traceset_context); - - //Remove local reference to the traces. - for(j=0; j 1){ + if(!lttv_trace_get_ref_number(trace_v)) + lttv_trace_destroy(trace_v); + + tab->traceset_info->traceset_context = + g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); + lttv_context_init( + LTTV_TRACESET_CONTEXT(tab-> + traceset_info->traceset_context),traceset); + //add state update hooks + lttv_state_add_event_hooks( + (LttvTracesetState*)tab->traceset_info->traceset_context); + + //Remove local reference to the traces. + for(j=0; jcurrent_time)); - }else{ - if(tab){ - while(tab->multi_vpaned->num_children){ - gtk_multi_vpaned_widget_delete(tab->multi_vpaned); - } - } - } - } - break; + //update current tab + //update_traceset(mw_data); + if(nb_trace > 1){ + + SetTraceset(mw_data, (gpointer)traceset); + // in expose now call_pending_read_hooks(mw_data); + + //lttvwindow_report_current_time(mw_data,&(tab->current_time)); + }else{ + if(tab){ + while(tab->multi_vpaned->num_children){ + gtk_multi_vpaned_widget_delete(tab->multi_vpaned); + } + } + } + } + break; } } } @@ -1193,6 +1401,84 @@ void remove_trace(GtkWidget * widget, gpointer user_data) } +/* Redraw all the viewers in the current tab */ +void redraw(GtkWidget *widget, gpointer user_data) +{ + GtkWidget * notebook = lookup_widget(widget, "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"); + } + + LttvHooks * tmp; + LttvAttributeValue value; + + g_assert(lttv_iattribute_find_by_path(tab->attributes, "hooks/redraw", LTTV_POINTER, &value)); + + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp != NULL) + lttv_hooks_call(tmp,NULL); +} + + +void continue_processing(GtkWidget *widget, gpointer user_data) +{ + GtkWidget * notebook = lookup_widget(widget, "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"); + } + + LttvHooks * tmp; + LttvAttributeValue value; + + g_assert(lttv_iattribute_find_by_path(tab->attributes, + "hooks/continue", LTTV_POINTER, &value)); + + tmp = (LttvHooks*)*(value.v_pointer); + if(tmp != NULL) + lttv_hooks_call(tmp,NULL); +} + +/* Stop the processing for the calling main window's current tab. + * It removes every processing requests that are in its list. It does not call + * the end request hooks, because the request is not finished. + */ + +void stop_processing(GtkWidget *widget, gpointer user_data) +{ + GtkWidget * notebook = lookup_widget(widget, "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"); + } + GSList *events_requests = tab->events_requests; + + GSList *iter = events_requests; + + while(iter != NULL) { + GSList *remove_iter = iter; + iter = g_slist_next(iter); + + g_free(remove_iter->data); + events_requests = g_slist_remove_link(events_requests, remove_iter); + } + g_assert(g_slist_length(events_requests) == 0); +} + + /* save will save the traceset to a file * Not implemented yet FIXME */ @@ -1219,10 +1505,19 @@ void zoom(GtkWidget * widget, double size) TimeWindow new_time_window; LttTime current_time, time_delta, time_s, time_e, time_tmp; MainWindow * mw_data = get_window_data_struct(widget); - Tab *tab = mw_data->current_tab; LttvTracesetContext *tsc; + GtkWidget * notebook = lookup_widget(widget, "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"); + } - if(tab==NULL) return; if(size == 1) return; tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); @@ -1244,7 +1539,6 @@ void zoom(GtkWidget * widget, double size) else { /* Center the image on the current time */ - g_critical("update is HERE"); new_time_window.start_time = ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0)); /* If on borders, don't fall off */ @@ -1339,20 +1633,28 @@ on_clone_traceset_activate (GtkMenuItem *menuitem, /* create_new_tab calls create_tab to construct a new tab in the main window */ -void create_new_tab(GtkWidget* widget, gpointer user_data){ - gchar label[PATH_LENGTH]; +Tab *create_new_tab(GtkWidget* widget, gpointer user_data){ + gchar label[PATH_MAX]; MainWindow * mw_data = get_window_data_struct(widget); GtkNotebook * notebook = (GtkNotebook *)lookup_widget(widget, "MNotebook"); if(notebook == NULL){ g_printf("Notebook does not exist\n"); - return; + return NULL; + } + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); + Tab *copy_tab; + + if(!page) { + copy_tab = NULL; + } else { + copy_tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); } - strcpy(label,"Page"); if(get_label(mw_data, label,"Get the name of the tab","Please input tab's name")) - create_tab (mw_data, NULL, notebook, label); + return (create_tab (mw_data, copy_tab, notebook, label)); } void @@ -1384,14 +1686,14 @@ on_close_activate (GtkMenuItem *menuitem, */ void -on_close_tab_activate (GtkMenuItem *menuitem, +on_close_tab_activate (GtkWidget *widget, gpointer user_data) { gint page_num; GtkWidget * notebook; GtkWidget * page; - MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); - notebook = lookup_widget((GtkWidget*)menuitem, "MNotebook"); + MainWindow * mw_data = get_window_data_struct(widget); + notebook = lookup_widget(widget, "MNotebook"); if(notebook == NULL){ g_printf("Notebook does not exist\n"); return; @@ -1401,14 +1703,22 @@ on_close_tab_activate (GtkMenuItem *menuitem, gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_num); - if( gtk_notebook_get_n_pages(GTK_NOTEBOOK(notebook)) == 0 ) - mw_data->current_tab = NULL; - else { - page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), - gtk_notebook_get_current_page(GTK_NOTEBOOK(notebook))); - mw_data->current_tab = - (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); +} + +void +on_close_tab_X_clicked (GtkWidget *widget, + gpointer user_data) +{ + gint page_num; + GtkWidget *notebook = lookup_widget(widget, "MNotebook"); + if(notebook == NULL){ + g_printf("Notebook does not exist\n"); + return; } + + if((page_num = gtk_notebook_page_num(GTK_NOTEBOOK(notebook), widget)) != -1) + gtk_notebook_remove_page(GTK_NOTEBOOK(notebook), page_num); + } @@ -1553,10 +1863,18 @@ on_trace_filter_activate (GtkMenuItem *menuitem, { MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); LttvTracesetSelector * s; - Tab *tab = mw_data->current_tab; GtkWidget * w; - - if(tab == NULL) return ; + 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_multi_vpaned_get_widget(tab->multi_vpaned); @@ -1592,7 +1910,7 @@ on_load_module_activate (GtkMenuItem *menuitem, { char ** dir; gint id; - char str[PATH_LENGTH], *str1; + char str[PATH_MAX], *str1; MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); GtkFileSelection * file_selector = (GtkFileSelection *)gtk_file_selection_new("Select a module"); if(remember_plugins_dir[0] != '\0') @@ -1605,8 +1923,8 @@ on_load_module_activate (GtkMenuItem *menuitem, case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_OK: dir = gtk_file_selection_get_selections (file_selector); - strncpy(str,dir[0],PATH_LENGTH); - strncpy(remember_plugins_dir,dir[0],PATH_LENGTH); + strncpy(str,dir[0],PATH_MAX); + strncpy(remember_plugins_dir,dir[0],PATH_MAX); str1 = strrchr(str,'/'); if(str1)str1++; else{ @@ -1687,8 +2005,8 @@ on_add_module_search_path_activate (GtkMenuItem *menuitem, case GTK_RESPONSE_ACCEPT: case GTK_RESPONSE_OK: dir = gtk_dir_selection_get_dir (file_selector); - strncpy(remember_plugins_dir,dir,PATH_LENGTH); - strncat(remember_plugins_dir,"/",PATH_LENGTH); + strncpy(remember_plugins_dir,dir,PATH_MAX); + strncat(remember_plugins_dir,"/",PATH_MAX); lttv_library_path_add(dir); case GTK_RESPONSE_REJECT: case GTK_RESPONSE_CANCEL: @@ -1776,6 +2094,28 @@ on_button_remove_trace_clicked (GtkButton *button, remove_trace((GtkWidget*)button, user_data); } +void +on_button_redraw_clicked (GtkButton *button, + gpointer user_data) +{ + redraw((GtkWidget*)button, user_data); +} + +void +on_button_continue_processing_clicked (GtkButton *button, + gpointer user_data) +{ + continue_processing((GtkWidget*)button, user_data); +} + +void +on_button_stop_processing_clicked (GtkButton *button, + gpointer user_data) +{ + stop_processing((GtkWidget*)button, user_data); +} + + void on_button_save_clicked (GtkButton *button, @@ -1891,7 +2231,6 @@ on_MWindow_configure (GtkWidget *widget, { 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; @@ -1928,11 +2267,6 @@ on_MNotebook_switch_page (GtkNotebook *notebook, guint page_num, gpointer user_data) { - MainWindow * mw_data = get_window_data_struct((GtkWidget*)notebook); - GtkWidget *cur_page = gtk_notebook_get_nth_page(notebook, page_num); - - mw_data->current_tab = - (Tab *)g_object_get_data(G_OBJECT(cur_page), "Tab_Info"); } @@ -2380,6 +2714,7 @@ void construct_main_window(MainWindow * parent) LttvIAttribute *attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); LttvAttributeValue value; + Tab *new_tab; new_m_window = g_new(MainWindow, 1); @@ -2391,8 +2726,6 @@ void construct_main_window(MainWindow * parent) gtk_widget_show (new_window); new_m_window->mwindow = new_window; - new_m_window->tab = NULL; - new_m_window->current_tab = NULL; new_m_window->attributes = attributes; g_assert(lttv_iattribute_find_by_path(attributes, @@ -2415,14 +2748,25 @@ void construct_main_window(MainWindow * parent) g_printf("Notebook does not exist\n"); return; } + gtk_notebook_popup_enable (GTK_NOTEBOOK(notebook)); //for now there is no name field in LttvTraceset structure //Use "Traceset" as the label for the default tab - if(parent) - create_tab(new_m_window, parent->current_tab, notebook, "Traceset"); - else { - create_tab(new_m_window, NULL, notebook, "Traceset"); + if(parent) { + GtkWidget * parent_notebook = lookup_widget(parent->mwindow, "MNotebook"); + GtkWidget *page = gtk_notebook_get_nth_page(GTK_NOTEBOOK(parent_notebook), + gtk_notebook_get_current_page(GTK_NOTEBOOK(parent_notebook))); + Tab *parent_tab; + + if(!page) { + parent_tab = NULL; + } else { + parent_tab = (Tab *)g_object_get_data(G_OBJECT(page), "Tab_Info"); + } + new_tab = create_tab(new_m_window, parent_tab, notebook, "Traceset"); + } else { + new_tab = create_tab(new_m_window, NULL, notebook, "Traceset"); if(g_init_trace != NULL){ - lttvwindow_add_trace(new_m_window->current_tab, + lttvwindow_add_trace(new_tab, g_init_trace); } } @@ -2447,17 +2791,6 @@ void tab_destructor(Tab * tab_instance) g_object_unref(tab_instance->interrupted_state); - if(tab_instance->mw->tab == tab_instance){ - tab_instance->mw->tab = tab_instance->next; - }else{ - Tab * tmp1, *tmp = tab_instance->mw->tab; - while(tmp != tab_instance){ - tmp1 = tmp; - tmp = tmp->next; - } - tmp1->next = tab_instance->next; - } - if(tab_instance->traceset_info->traceset_context != NULL){ //remove state update hooks lttv_state_remove_event_hooks( @@ -2473,10 +2806,8 @@ void tab_destructor(Tab * tab_instance) 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); + ltt_trace_close(lttv_trace(trace)); } - // lttv_trace_destroy(trace); } } lttv_traceset_destroy(tab_instance->traceset_info->traceset); @@ -2492,146 +2823,130 @@ void tab_destructor(Tab * tab_instance) /* Create a tab and insert it into the current main window */ -void * create_tab(MainWindow * mw, Tab *copy_tab, +Tab* create_tab(MainWindow * mw, Tab *copy_tab, GtkNotebook * notebook, char * label) { GList * list; - Tab * tmp_tab; + Tab * tab; LttTime tmp_time; //create a new tab data structure - tmp_tab = mw->tab; - while(tmp_tab && tmp_tab->next) tmp_tab = tmp_tab->next; - if(!tmp_tab){ - mw->current_tab = NULL; - tmp_tab = g_new(Tab,1); - mw->tab = tmp_tab; - }else{ - tmp_tab->next = g_new(Tab,1); - tmp_tab = tmp_tab->next; - } + tab = g_new(Tab,1); //construct and initialize the traceset_info - tmp_tab->traceset_info = g_new(TracesetInfo,1); + tab->traceset_info = g_new(TracesetInfo,1); if(copy_tab) { - tmp_tab->traceset_info->traceset = + tab->traceset_info->traceset = lttv_traceset_copy(copy_tab->traceset_info->traceset); } else { - tmp_tab->traceset_info->traceset = lttv_traceset_new(); + tab->traceset_info->traceset = lttv_traceset_new(); } //FIXME : this is g_debug level lttv_attribute_write_xml( - lttv_traceset_attribute(tmp_tab->traceset_info->traceset), + lttv_traceset_attribute(tab->traceset_info->traceset), stdout, 0, 4); fflush(stdout); //FIXME copy not implemented in lower level - tmp_tab->traceset_info->traceset_context = + tab->traceset_info->traceset_context = g_object_new(LTTV_TRACESET_STATS_TYPE, NULL); - g_assert(tmp_tab->traceset_info->traceset_context != NULL); + g_assert(tab->traceset_info->traceset_context != NULL); lttv_context_init( - LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context), - tmp_tab->traceset_info->traceset); + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context), + tab->traceset_info->traceset); //add state update hooks lttv_state_add_event_hooks( - (LttvTracesetState*)tmp_tab->traceset_info->traceset_context); + (LttvTracesetState*)tab->traceset_info->traceset_context); //determine the current_time and time_window of the tab - if(mw->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->current_tab->time_window; - tmp_tab->current_time = mw->current_tab->current_time; + if(copy_tab != NULL){ + tab->time_window = copy_tab->time_window; + tab->current_time = copy_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. - // 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.start_time; + tab->time_window.start_time = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.start_time; if(DEFAULT_TIME_WIDTH_S < - LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.end_time.tv_sec) + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.end_time.tv_sec) tmp_time.tv_sec = DEFAULT_TIME_WIDTH_S; else tmp_time.tv_sec = - LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.end_time.tv_sec; + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.end_time.tv_sec; tmp_time.tv_nsec = 0; - tmp_tab->time_window.time_width = tmp_time ; - tmp_tab->current_time.tv_sec = - LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.start_time.tv_sec; - tmp_tab->current_time.tv_nsec = - LTTV_TRACESET_CONTEXT(tmp_tab->traceset_info->traceset_context)->time_span.start_time.tv_nsec; + tab->time_window.time_width = tmp_time ; + tab->current_time.tv_sec = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.start_time.tv_sec; + tab->current_time.tv_nsec = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context)-> + time_span.start_time.tv_nsec; } - /* Become the current tab */ - mw->current_tab = tmp_tab; + tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); + tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL); + tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new(); + gtk_widget_show((GtkWidget*)tab->multi_vpaned); + tab->mw = mw; + + /*{ + // Display a label with a X + GtkWidget *w_hbox = gtk_hbox_new(FALSE, 4); + GtkWidget *w_label = gtk_label_new (label); + GtkWidget *pixmap = create_pixmap(GTK_WIDGET(notebook), "close.png"); + GtkWidget *w_button = gtk_button_new (); + gtk_container_add(GTK_CONTAINER(w_button), pixmap); + //GtkWidget *w_button = gtk_button_new_with_label("x"); + + gtk_button_set_relief(GTK_BUTTON(w_button), GTK_RELIEF_NONE); + + gtk_box_pack_start(GTK_BOX(w_hbox), w_label, TRUE, TRUE, 0); + gtk_box_pack_end(GTK_BOX(w_hbox), w_button, FALSE, + FALSE, 0); + + g_signal_connect_swapped (w_button, "clicked", + G_CALLBACK (on_close_tab_X_clicked), + tab->multi_vpaned); + + gtk_widget_set_state(w_button, GTK_STATE_ACTIVE); - tmp_tab->attributes = LTTV_IATTRIBUTE(g_object_new(LTTV_ATTRIBUTE_TYPE, NULL)); - tmp_tab->interrupted_state = g_object_new(LTTV_ATTRIBUTE_TYPE, NULL); - tmp_tab->multi_vpaned = (GtkMultiVPaned*)gtk_multi_vpaned_new(); - tmp_tab->multi_vpaned->tab = mw->current_tab; - gtk_widget_show((GtkWidget*)tmp_tab->multi_vpaned); - tmp_tab->next = NULL; - tmp_tab->mw = mw; + gtk_widget_show (w_label); + gtk_widget_show (pixmap); + gtk_widget_show (w_button); + gtk_widget_show (w_hbox); + + tab->label = w_hbox; + }*/ + + + tab->label = gtk_label_new (label); + gtk_widget_show (tab->label); - tmp_tab->label = gtk_label_new (label); - gtk_widget_show (tmp_tab->label); /* Start with empty events requests list */ - tmp_tab->events_requests = NULL; - tmp_tab->events_request_pending = FALSE; + tab->events_requests = NULL; + tab->events_request_pending = FALSE; g_object_set_data_full( - G_OBJECT(tmp_tab->multi_vpaned), + G_OBJECT(tab->multi_vpaned), "Tab_Info", - tmp_tab, - (GDestroyNotify)tab_destructor); + tab, + (GDestroyNotify)tab_destructor); //insert tab into notebook - gtk_notebook_append_page(notebook, (GtkWidget*)tmp_tab->multi_vpaned, tmp_tab->label); + gtk_notebook_append_page(notebook, + (GtkWidget*)tab->multi_vpaned, + tab->label); list = gtk_container_get_children(GTK_CONTAINER(notebook)); gtk_notebook_set_current_page(notebook,g_list_length(list)-1); // always show : not if(g_list_length(list)>1) gtk_notebook_set_show_tabs(notebook, TRUE); -} - -/** - * Function to show each viewer in the current tab. - * It will be called by main window, call show on each registered viewer, - * will call process traceset and then it will - * @param main_win the main window the viewer belongs to. - */ -//FIXME Only one time request maximum for now! -void show_viewer(MainWindow *main_win) -{ - LttvAttributeValue value; - LttvHooks * tmp; - int i; - LttvTracesetContext * tsc; - Tab *tab = main_win->current_tab; - - if(tab == NULL) return ; - - tsc =(LttvTracesetContext*)tab->traceset_info->traceset_context; - - g_assert(lttv_iattribute_find_by_path(tab->attributes, - "hooks/showviewer", LTTV_POINTER, &value)); - tmp = (LttvHooks*)*(value.v_pointer); - if(tmp == NULL) - { - g_warning("The viewer(s) did not add any show hook"); - return; - } - - - // Call the show, where viewers add hooks to context and fill the - // time and number of events requested it the time_requests GArray. - lttv_hooks_call(tmp, NULL); - - + return tab; } /*