X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Flttvwindow%2Flttvwindow%2Fcallbacks.c;h=22fe64137a274aa96078fb617d3cb6d9c61327d1;hb=a998b781c5e28cb4a364ce09cd99dc1d3dbf6a06;hp=2f42d26398a1051ede60d028fdf4a50828278ea6;hpb=10a1069a786aebb338aee5a31c1e3e17198aacbb;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 2f42d263..22fe6413 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) { @@ -471,8 +414,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) /* Set the tab's time window and current time if * out of bounds */ if(ltt_time_compare(tab->time_window.start_time, time_span.start_time) < 0 - || ltt_time_compare( ltt_time_add(tab->time_window.start_time, - tab->time_window.time_width), + || ltt_time_compare(tab->time_window.end_time, time_span.end_time) > 0) { new_time_window.start_time = time_span.start_time; @@ -486,10 +428,17 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) tmp_time.tv_sec = time_span.end_time.tv_sec; tmp_time.tv_nsec = 0; new_time_window.time_width = tmp_time ; + new_time_window.time_width_double = ltt_time_to_double(tmp_time); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; } 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_destroy(tab->filter); + tab->filter = NULL; + #if 0 /* Set scrollbar */ GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); @@ -565,7 +514,7 @@ int SetTraceset(Tab * tab, LttvTraceset *traceset) * 0 : filters updated * 1 : no filter hooks to update; not an error. */ - +#if 0 int SetFilter(Tab * tab, gpointer filter) { LttvHooks * tmp; @@ -581,7 +530,7 @@ int SetFilter(Tab * tab, gpointer filter) return 0; } - +#endif //0 /** @@ -661,13 +610,13 @@ 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; } mw_data = (MainWindow *) g_object_get_data(G_OBJECT(mw),"main_window_data"); if(mw_data == NULL){ - g_printf("Main window data does not exist\n"); + g_warning("Main window data does not exist\n"); return NULL; } return mw_data; @@ -682,10 +631,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); } } @@ -724,7 +673,8 @@ gint viewer_container_position(GtkWidget *container, GtkWidget *child) if(child == NULL) return -1; gint pos; - GValue value = { 0, }; + GValue value; + memset(&value, 0, sizeof(GValue)); g_value_init(&value, G_TYPE_INT); gtk_container_child_get_property(GTK_CONTAINER(container), child, @@ -859,7 +809,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: @@ -871,42 +821,6 @@ void open_traceset(GtkWidget * widget, gpointer user_data) } -static void events_request_free(EventsRequest *events_request) -{ - if(events_request == NULL) return; - - if(events_request->start_position != NULL) - lttv_traceset_context_position_destroy(events_request->start_position); - if(events_request->end_position != NULL) - lttv_traceset_context_position_destroy(events_request->end_position); - if(events_request->hooks != NULL) - g_array_free(events_request->hooks, TRUE); - if(events_request->before_chunk_traceset != NULL) - lttv_hooks_destroy(events_request->before_chunk_traceset); - if(events_request->before_chunk_trace != NULL) - lttv_hooks_destroy(events_request->before_chunk_trace); - if(events_request->before_chunk_tracefile != NULL) - lttv_hooks_destroy(events_request->before_chunk_tracefile); - if(events_request->event != NULL) - lttv_hooks_destroy(events_request->event); - if(events_request->event_by_id != NULL) - lttv_hooks_by_id_destroy(events_request->event_by_id); - if(events_request->after_chunk_tracefile != NULL) - lttv_hooks_destroy(events_request->after_chunk_tracefile); - if(events_request->after_chunk_trace != NULL) - lttv_hooks_destroy(events_request->after_chunk_trace); - if(events_request->after_chunk_traceset != NULL) - lttv_hooks_destroy(events_request->after_chunk_traceset); - if(events_request->before_request != NULL) - lttv_hooks_destroy(events_request->before_request); - if(events_request->after_request != NULL) - lttv_hooks_destroy(events_request->after_request); - - g_free(events_request); -} - - - /* lttvwindow_process_pending_requests * * This internal function gets called by g_idle, taking care of the pending @@ -934,9 +848,6 @@ static void events_request_free(EventsRequest *events_request) gboolean lttvwindow_process_pending_requests(Tab *tab) { - unsigned max_nb_events; - GdkWindow * win; - GdkCursor * new; GtkWidget* widget; LttvTracesetContext *tsc; LttvTracefileContext *tfc; @@ -1022,8 +933,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } /* 0.2 Seek tracefiles positions to context position */ + //g_assert(lttv_process_traceset_seek_position(tsc, sync_position) == 0); lttv_process_traceset_synchronize_tracefiles(tsc); - + /* Events processing algorithm implementation */ /* Warning : the gtk_events_pending takes a LOT of cpu time. So what we do @@ -1050,7 +962,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) ltime = g_slist_append(ltime, g_slist_nth_data(list_out, 0)); for(iter=g_slist_nth(list_out,1);iter!=NULL;iter=g_slist_next(iter)) { /* Find all time requests with the lowest start time in list_out */ - guint index_ltime = g_array_index(ltime, guint, 0); EventsRequest *event_request_ltime = (EventsRequest*)g_slist_nth_data(ltime, 0); EventsRequest *event_request_list_out = (EventsRequest*)iter->data; @@ -1166,6 +1077,9 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) lttv_process_traceset_middle(tsc, events_request->start_time, G_MAXUINT, NULL); +#ifdef DEBUG + g_assert(seek_count < LTTV_STATE_SAVE_INTERVAL); +#endif //DEBUG } else { @@ -1234,7 +1148,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->event_by_id); else { guint nb_trace = lttv_traceset_number(tsc->ts); - g_assert(events_request->trace < nb_trace && + g_assert((guint)events_request->trace < nb_trace && events_request->trace > -1); LttvTraceContext *tc = tsc->traces[events_request->trace]; @@ -1271,7 +1185,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->event_by_id); else { guint nb_trace = lttv_traceset_number(tsc->ts); - g_assert(events_request->trace < nb_trace && + g_assert((guint)events_request->trace < nb_trace && events_request->trace > -1); LttvTraceContext *tc = tsc->traces[events_request->trace]; @@ -1335,7 +1249,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) events_request->event_by_id); else { guint nb_trace = lttv_traceset_number(tsc->ts); - g_assert(events_request->trace < nb_trace && + g_assert((guint)events_request->trace < nb_trace && events_request->trace > -1); LttvTraceContext *tc = tsc->traces[events_request->trace]; @@ -1448,7 +1362,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) { /* 4. Call process traceset middle */ - g_debug("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); + g_debug("Calling process traceset middle with %p, %lu sec %lu nsec, %u 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); @@ -1630,7 +1544,7 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) /* 1.1. Use current postition as start position */ if(events_request->start_position != NULL) lttv_traceset_context_position_destroy(events_request->start_position); - events_request->start_position = lttv_traceset_context_position_new(); + events_request->start_position = lttv_traceset_context_position_new(tsc); lttv_traceset_context_position_save(tsc, events_request->start_position); /* 1.2. Remove start time */ @@ -1656,10 +1570,10 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) } - /* C Unlock Traces */ { - //lttv_process_traceset_get_sync_data(tsc); + lttv_process_traceset_get_sync_data(tsc); + //lttv_traceset_context_position_save(tsc, sync_position); guint iter_trace; @@ -1671,7 +1585,6 @@ gboolean lttvwindow_process_pending_requests(Tab *tab) lttvwindowtraces_unlock(trace_v); } } - #if 0 //set the cursor back to normal gdk_window_set_cursor(win, NULL); @@ -1703,62 +1616,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; @@ -1827,7 +1684,6 @@ void add_trace(GtkWidget * widget, gpointer user_data) const char * dir; char abs_path[PATH_MAX]; gint id; - gint i; MainWindow * mw_data = get_window_data_struct(widget); GtkWidget * notebook = lookup_widget(widget, "MNotebook"); @@ -1893,31 +1749,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 @@ -1925,9 +1756,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; @@ -2239,12 +2072,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"); } @@ -2257,7 +2090,7 @@ void zoom(GtkWidget * widget, double size) { TimeInterval time_span; TimeWindow new_time_window; - LttTime current_time, time_delta, time_s, time_e, time_tmp; + LttTime current_time, time_delta; MainWindow * mw_data = get_window_data_struct(widget); LttvTracesetContext *tsc; GtkWidget * notebook = lookup_widget(widget, "MNotebook"); @@ -2283,31 +2116,46 @@ void zoom(GtkWidget * widget, double size) if(size == 0){ new_time_window.start_time = time_span.start_time; new_time_window.time_width = time_delta; + new_time_window.time_width_double = ltt_time_to_double(time_delta); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; }else{ new_time_window.time_width = ltt_time_div(new_time_window.time_width, size); + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); if(ltt_time_compare(new_time_window.time_width,time_delta) > 0) { /* Case where zoom out is bigger than trace length */ new_time_window.start_time = time_span.start_time; new_time_window.time_width = time_delta; + new_time_window.time_width_double = ltt_time_to_double(time_delta); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; } else { /* Center the image on the current time */ new_time_window.start_time = - ltt_time_sub(current_time, ltt_time_div(new_time_window.time_width, 2.0)); + ltt_time_sub(current_time, + ltt_time_from_double(new_time_window.time_width_double/2.0)); + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; /* If on borders, don't fall off */ if(ltt_time_compare(new_time_window.start_time, time_span.start_time) <0) { new_time_window.start_time = time_span.start_time; + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; } else { - if(ltt_time_compare( - ltt_time_add(new_time_window.start_time, new_time_window.time_width), - time_span.end_time) > 0) + if(ltt_time_compare(new_time_window.end_time, + time_span.end_time) > 0) { new_time_window.start_time = ltt_time_sub(time_span.end_time, new_time_window.time_width); + + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width) ; } } @@ -2338,12 +2186,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"); } @@ -2374,7 +2222,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), @@ -2390,6 +2238,8 @@ Tab *create_new_tab(GtkWidget* widget, gpointer user_data){ strcpy(label,"Page"); if(get_label(mw_data, label,"Get the name of the tab","Please input tab's name")) return (create_tab (mw_data, copy_tab, notebook, label)); + else + return NULL; } void @@ -2430,7 +2280,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; } @@ -2447,7 +2297,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; } @@ -2493,7 +2343,7 @@ void on_quit_activate (GtkMenuItem *menuitem, gpointer user_data) { - gtk_main_quit (); + mainwindow_quit(); } @@ -2501,7 +2351,7 @@ void on_cut_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Cut\n"); + g_info("Cut\n"); } @@ -2509,7 +2359,7 @@ void on_copy_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Copye\n"); + g_info("Copye\n"); } @@ -2517,7 +2367,7 @@ void on_paste_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Paste\n"); + g_info("Paste\n"); } @@ -2525,7 +2375,7 @@ void on_delete_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Delete\n"); + g_info("Delete\n"); } @@ -2592,47 +2442,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"); } @@ -2725,8 +2539,8 @@ on_load_library_activate (GtkMenuItem *menuitem, lttv_module_require(str1, &error); #endif //0 lttv_library_load(str1, &error); - if(error != NULL) g_warning(error->message); - else g_printf("Load library: %s\n", str); + if(error != NULL) g_warning("%s", error->message); + else g_info("Load library: %s\n", str); g_strfreev(dir); case GTK_RESPONSE_REJECT: case GTK_RESPONSE_CANCEL: @@ -2752,40 +2566,39 @@ on_unload_library_activate (GtkMenuItem *menuitem, { MainWindow * mw_data = get_window_data_struct((GtkWidget*)menuitem); - LttvLibrary *library; - { - GPtrArray *name; - guint nb,i; - gchar *lib_name; - name = g_ptr_array_new(); - nb = lttv_library_number(); - LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb); - /* ask for the library name */ + LttvLibrary *library = NULL; + GPtrArray *name; + guint nb,i; + gchar *lib_name; + name = g_ptr_array_new(); + nb = lttv_library_number(); + LttvLibraryInfo *lib_info = g_new(LttvLibraryInfo,nb); + /* ask for the library name */ + + for(i=0;ipdata), name->len, + "Select a library", "Libraries"); + if(lib_name != NULL) { for(i=0;ipdata), name->len, - "Select a library", "Libraries"); - if(lib_name != NULL) { - for(i=0;imessage); - else g_printf("Load module: %s\n", module_name_out); + if(error != NULL) g_warning("%s", error->message); + else g_info("Load module: %s", module_name_out); #if 0 @@ -2919,7 +2732,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: @@ -2980,7 +2793,7 @@ on_unload_module_activate (GtkMenuItem *menuitem, if(lib_name == NULL) return; } - LttvModule *module; + LttvModule *module = NULL; { /* Ask for the module to load : list modules in the selected lib */ GPtrArray *name; @@ -3017,7 +2830,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); } @@ -3092,15 +2905,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"); } @@ -3108,7 +2913,7 @@ void on_save_configuration_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Save configuration\n"); + g_info("Save configuration\n"); } @@ -3116,7 +2921,7 @@ void on_content_activate (GtkMenuItem *menuitem, gpointer user_data) { - g_printf("Content\n"); + g_info("Content\n"); } @@ -3167,23 +2972,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."); @@ -3369,9 +3178,9 @@ 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 (); + mainwindow_quit(); } gboolean @@ -3380,11 +3189,6 @@ on_MWindow_configure (GtkWidget *widget, gpointer user_data) { MainWindow * mw_data = get_window_data_struct((GtkWidget*)widget); - float width = event->width; - TimeWindow time_win; - double ratio; - TimeInterval *time_span; - LttTime time; // MD : removed time width modification upon resizing of the main window. // The viewers will redraw themselves completely, without time interval @@ -3432,9 +3236,10 @@ void time_change_manager (Tab *tab, LttvTracesetContext *tsc = LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; LttTime start_time = new_time_window.start_time; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; + g_assert(ltt_time_compare(start_time, end_time) < 0); + /* Set scrollbar */ GtkAdjustment *adjustment = gtk_range_get_adjustment(GTK_RANGE(tab->scrollbar)); LttTime upper = ltt_time_sub(time_span.end_time, time_span.start_time); @@ -3454,18 +3259,15 @@ void time_change_manager (Tab *tab, "lower", 0.0, /* lower */ "upper", - ltt_time_to_double(upper) - * NANOSECONDS_PER_SECOND, /* upper */ + ltt_time_to_double(upper), /* upper */ "step_increment", - ltt_time_to_double(new_time_window.time_width) - / SCROLL_STEP_PER_PAGE - * NANOSECONDS_PER_SECOND, /* step increment */ + new_time_window.time_width_double + / SCROLL_STEP_PER_PAGE, /* step increment */ "page_increment", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page increment */ + new_time_window.time_width_double, + /* page increment */ "page_size", - ltt_time_to_double(new_time_window.time_width) - * NANOSECONDS_PER_SECOND, /* page size */ + new_time_window.time_width_double, /* page size */ NULL); gtk_adjustment_changed(adjustment); @@ -3473,13 +3275,12 @@ void time_change_manager (Tab *tab, // "value", // ltt_time_to_double( // ltt_time_sub(start_time, time_span.start_time)) - // * NANOSECONDS_PER_SECOND, /* value */ + // , /* value */ // NULL); //gtk_adjustment_value_changed(adjustment); gtk_range_set_value(GTK_RANGE(tab->scrollbar), ltt_time_to_double( - ltt_time_sub(start_time, time_span.start_time)) - * NANOSECONDS_PER_SECOND /* value */); + ltt_time_sub(start_time, time_span.start_time)) /* value */); /* set the time bar. */ /* start seconds */ @@ -3571,8 +3372,7 @@ on_MEntry1_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; new_time_window.start_time.tv_sec = value; @@ -3593,19 +3393,21 @@ on_MEntry1_value_changed (GtkSpinButton *spinbutton, new_time_window.start_time.tv_nsec = time_span.end_time.tv_nsec-1; } - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push back end time : keep the same time width * if possible, else end traceset time */ - end_time = LTT_TIME_MIN(time_span.end_time, - ltt_time_add(new_time_window.start_time, - new_time_window.time_width) - ); + end_time = LTT_TIME_MIN(ltt_time_add(new_time_window.start_time, + new_time_window.time_width), + time_span.end_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); + + new_time_window.end_time = end_time; time_change_manager(tab, new_time_window); @@ -3623,24 +3425,25 @@ on_MEntry2_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; new_time_window.start_time.tv_nsec = value; - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push back end time : keep the same time width * if possible, else end traceset time */ - end_time = LTT_TIME_MIN(time_span.end_time, - ltt_time_add(new_time_window.start_time, - new_time_window.time_width) - ); + end_time = LTT_TIME_MIN(ltt_time_add(new_time_window.start_time, + new_time_window.time_width), + time_span.end_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); + + new_time_window.end_time = end_time; time_change_manager(tab, new_time_window); @@ -3658,8 +3461,8 @@ on_MEntry3_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; + end_time.tv_sec = value; /* end nanoseconds */ @@ -3679,20 +3482,23 @@ on_MEntry3_value_changed (GtkSpinButton *spinbutton, end_time.tv_nsec = time_span.end_time.tv_nsec; } - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push front start time : keep the same time width * if possible, else end traceset time */ - new_time_window.start_time = LTT_TIME_MAX(time_span.start_time, - ltt_time_sub(end_time, - new_time_window.time_width) - ); + new_time_window.start_time = LTT_TIME_MAX( + ltt_time_sub(end_time, + new_time_window.time_width), + time_span.start_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); + new_time_window.end_time = end_time; + time_change_manager(tab, new_time_window); } @@ -3709,23 +3515,25 @@ on_MEntry4_value_changed (GtkSpinButton *spinbutton, TimeWindow new_time_window = tab->time_window; - LttTime end_time = ltt_time_add(new_time_window.start_time, - new_time_window.time_width); + LttTime end_time = new_time_window.end_time; + end_time.tv_nsec = value; - /* check if end time selected is below or equal */ if(ltt_time_compare(new_time_window.start_time, end_time) >= 0) { /* Then, we must push front start time : keep the same time width * if possible, else end traceset time */ - new_time_window.start_time = LTT_TIME_MAX(time_span.start_time, - ltt_time_sub(end_time, - new_time_window.time_width) - ); + new_time_window.start_time = LTT_TIME_MAX( + ltt_time_sub(end_time, + new_time_window.time_width), + time_span.start_time); } /* Fix the time width to fit start time and end time */ new_time_window.time_width = ltt_time_sub(end_time, new_time_window.start_time); + new_time_window.time_width_double = + ltt_time_to_double(new_time_window.time_width); + new_time_window.end_time = end_time; time_change_manager(tab, new_time_window); @@ -3782,6 +3590,22 @@ void current_time_change_manager (Tab *tab, tab->current_time_manager_lock = FALSE; } +void current_position_change_manager(Tab *tab, + LttvTracesetContextPosition *pos) +{ + LttvTracesetContext *tsc = + LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); + TimeInterval time_span = tsc->time_span; + + g_assert(lttv_process_traceset_seek_position(tsc, pos) == 0); + LttTime new_time = lttv_traceset_context_position_get_time(pos); + + current_time_change_manager(tab, new_time); + + set_current_position(tab, pos); +} + + void on_MEntry5_value_changed (GtkSpinButton *spinbutton, gpointer user_data) @@ -3841,7 +3665,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, LTTV_TRACESET_CONTEXT(tab->traceset_info->traceset_context); TimeInterval time_span = tsc->time_span; - time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time = ltt_time_add(ltt_time_from_double(value), time_span.start_time); new_time_window.start_time = time; @@ -3849,7 +3673,13 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, page_size = adjust->page_size; new_time_window.time_width = - ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); + ltt_time_from_double(page_size); + + new_time_window.time_width_double = + page_size; + + new_time_window.end_time = ltt_time_add(new_time_window.start_time, + new_time_window.time_width); time_change_manager(tab, new_time_window); @@ -3864,7 +3694,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, //time = ltt_time_sub(time_span->end_time, time_span->start_time); //time = ltt_time_mul(time, (float)ratio); //time = ltt_time_add(time_span->start_time, time); - time = ltt_time_add(ltt_time_from_double(value/NANOSECONDS_PER_SECOND), + time = ltt_time_add(ltt_time_from_double(value), time_span.start_time); time_window.start_time = time; @@ -3872,7 +3702,7 @@ void scroll_value_changed_cb(GtkWidget *scrollbar, page_size = adjust->page_size; time_window.time_width = - ltt_time_from_double(page_size/NANOSECONDS_PER_SECOND); + ltt_time_from_double(page_size); //time = ltt_time_sub(time_span.end_time, time); //if(ltt_time_compare(time,time_window.time_width) < 0){ // time_window.time_width = time; @@ -3884,237 +3714,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)); @@ -4443,7 +4047,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)); } @@ -4483,7 +4087,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); @@ -4502,7 +4107,6 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, { GList * list; Tab * tab; - LttTime tmp_time; //create a new tab data structure tab = g_new(Tab,1); @@ -4513,8 +4117,15 @@ 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 */ + tab->filter = lttv_filter_clone(copy_tab->filter); + } else { tab->traceset_info->traceset = lttv_traceset_new(); + tab->filter = NULL; } #ifdef DEBUG @@ -4573,6 +4184,10 @@ Tab* create_tab(MainWindow * mw, Tab *copy_tab, tab->viewer_container = gtk_vbox_new(TRUE, 2); tab->scrollbar = gtk_hscrollbar_new(NULL); //tab->multivpaned = gtk_multi_vpaned_new(); + tab->time_window.start_time = ltt_time_zero; + tab->time_window.end_time = ltt_time_zero; + tab->time_window.time_width = ltt_time_zero; + tab->current_time = ltt_time_zero; gtk_box_pack_start(GTK_BOX(tab->vbox), tab->viewer_container,