X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodules%2Fgui%2Fstatistics%2Fstatistics.c;h=87a3e762f74f22fa2736e0eb4efcf86e0fcf451c;hb=93ac601b7487eba4b0733f44117f45fa9dd0baee;hp=63ae23cf06256c27909d0966f4af58929336d408;hpb=0af2d5b161ebcd37e4e37d5e9ac079251ba747f7;p=lttv.git diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c index 63ae23cf..87a3e762 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c +++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c @@ -16,7 +16,12 @@ * MA 02111-1307, USA. */ +#ifdef HAVE_CONFIG_H +#include +#endif + #include +#include #include #include @@ -52,13 +57,12 @@ static void request_background_data(StatisticViewerData *svd); GtkWidget *guistatistic_get_widget(StatisticViewerData *svd); //! Statistic Viewer's constructor hook -GtkWidget *h_gui_statistic(Tab *tab, LttvTracesetSelector * s, char * key); +GtkWidget *h_gui_statistic(Tab *tab); //! Statistic Viewer's constructor StatisticViewerData *gui_statistic(Tab *tab); //! Statistic Viewer's destructor void gui_statistic_destructor(StatisticViewerData *statistic_viewer_data); -void grab_focus(GtkWidget *widget, gpointer data); static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data); void statistic_destroy_hash_key(gpointer key); @@ -164,9 +168,8 @@ static void request_background_data(StatisticViewerData *svd) * information. Happens when two viewers ask for it before servicing * starts. */ - lttvwindowtraces_background_request_remove(trace, "stats"); - lttvwindowtraces_background_request_queue(trace, - "stats"); + if(!lttvwindowtraces_background_request_find(trace, "stats")) + lttvwindowtraces_background_request_queue(trace, "stats"); lttvwindowtraces_background_notify_queue(svd, trace, ltt_time_infinite, @@ -181,6 +184,9 @@ static void request_background_data(StatisticViewerData *svd) background_ready_hook); } + } else { + /* ready */ + lttv_hooks_call(background_ready_hook, NULL); } } lttv_hooks_destroy(background_ready_hook); @@ -225,7 +231,7 @@ gui_statistic_destructor(StatisticViewerData *statistic_viewer_data) * @return The widget created. */ GtkWidget * -h_gui_statistic(Tab *tab, LttvTracesetSelector * s, char * key) +h_gui_statistic(Tab *tab) { StatisticViewerData* statistic_viewer_data = gui_statistic(tab) ; @@ -282,7 +288,7 @@ gui_statistic(Tab *tab) statistic_viewer_data->statistic_hash = g_hash_table_new_full(g_str_hash, g_str_equal, statistic_destroy_hash_key, - statistic_destroy_hash_data); + NULL); statistic_viewer_data->hpaned_v = gtk_hpaned_new(); statistic_viewer_data->store_m = gtk_tree_store_new (N_COLUMNS, G_TYPE_STRING); @@ -291,10 +297,6 @@ gui_statistic(Tab *tab) GTK_TREE_MODEL (statistic_viewer_data->store_m)); g_object_unref (G_OBJECT (statistic_viewer_data->store_m)); - g_signal_connect (G_OBJECT (statistic_viewer_data->tree_v), "grab-focus", - G_CALLBACK (grab_focus), - statistic_viewer_data); - // Setup the selection handler statistic_viewer_data->select_c = gtk_tree_view_get_selection (GTK_TREE_VIEW (statistic_viewer_data->tree_v)); gtk_tree_selection_set_mode (statistic_viewer_data->select_c, GTK_SELECTION_SINGLE); @@ -327,15 +329,15 @@ gui_statistic(Tab *tab) GTK_POLICY_AUTOMATIC,GTK_POLICY_AUTOMATIC); statistic_viewer_data->text_v = gtk_text_view_new (); - g_signal_connect (G_OBJECT (statistic_viewer_data->text_v), "grab-focus", - G_CALLBACK (grab_focus), - statistic_viewer_data); gtk_text_view_set_editable(GTK_TEXT_VIEW(statistic_viewer_data->text_v),FALSE); gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(statistic_viewer_data->text_v),FALSE); gtk_container_add (GTK_CONTAINER (statistic_viewer_data->scroll_win_text), statistic_viewer_data->text_v); gtk_paned_pack2(GTK_PANED(statistic_viewer_data->hpaned_v), statistic_viewer_data->scroll_win_text, TRUE, FALSE); + gtk_container_set_border_width( + GTK_CONTAINER(statistic_viewer_data->hpaned_v), 1); + gtk_widget_show(statistic_viewer_data->scroll_win_tree); gtk_widget_show(statistic_viewer_data->scroll_win_text); gtk_widget_show(statistic_viewer_data->tree_v); @@ -356,13 +358,6 @@ gui_statistic(Tab *tab) return statistic_viewer_data; } -void grab_focus(GtkWidget *widget, gpointer data) -{ - StatisticViewerData *statistic_viewer_data = (StatisticViewerData *)data; - Tab * tab = statistic_viewer_data->tab; - lttvwindow_report_focus(tab, guistatistic_get_widget(statistic_viewer_data)); -} - static void tree_selection_changed_cb (GtkTreeSelection *selection, gpointer data) { @@ -403,15 +398,12 @@ void statistic_destroy_hash_key(gpointer key) g_free(key); } -void statistic_destroy_hash_data(gpointer data) -{ - // g_free(data); -} - +#ifdef DEBUG #include extern FILE *stdin; extern FILE *stdout; extern FILE *stderr; +#endif //DEBUG void show_traceset_stats(StatisticViewerData * statistic_viewer_data) { @@ -448,11 +440,15 @@ void show_traceset_stats(StatisticViewerData * statistic_viewer_data) //show stats for all traces for(i = 0 ; i < nb ; i++) { tcs = (LttvTraceStats *)(LTTV_TRACESET_CONTEXT(tscs)->traces[i]); +#if 0 //FIXME desc = ltt_trace_system_description(tcs->parent.parent.t); - sprintf(trace_str, "Trace on system %s at time %d secs", + LttTime start_time = ltt_trace_system_description_trace_start_time(desc); + sprintf(trace_str, "Trace on system %s at time %lu.%09lu", ltt_trace_system_description_node_name(desc), - (ltt_trace_system_description_trace_start_time(desc)).tv_sec); - + start_time.tv_sec, + start_time.tv_nsec); +#endif //0 + sprintf(trace_str, g_quark_to_string(ltt_trace_name(tcs->parent.parent.t))); gtk_tree_store_append (store, &iter, NULL); gtk_tree_store_set (store, &iter,NAME_COLUMN,trace_str,-1); path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter); @@ -506,7 +502,6 @@ void show_statistic(StatisticViewerData * statistic_viewer_data, LttvAttribute* stats, GtkTextBuffer* buf) { int i, nb , flag; - LttvAttribute *subtree; LttvAttributeName name; LttvAttributeValue value; LttvAttributeType type; @@ -539,7 +534,7 @@ void show_statistic(StatisticViewerData * statistic_viewer_data, sprintf(type_value, " : %f\n", *value.v_double); break; case LTTV_TIME: - sprintf(type_value, " : %10u.%09u\n", value.v_time->tv_sec, + sprintf(type_value, " : %10lu.%09lu\n", value.v_time->tv_sec, value.v_time->tv_nsec); break; case LTTV_POINTER: @@ -675,7 +670,8 @@ void statistic_remove_context_hooks(StatisticViewerData * statistic_viewer_data, */ static void init() { - lttvwindow_register_constructor("/", + lttvwindow_register_constructor("guistatistics", + "/", "Insert Statistic Viewer", hGuiStatisticInsert_xpm, "Insert Statistic Viewer", @@ -699,7 +695,6 @@ void statistic_destroy_walk(gpointer data, gpointer user_data) * everything that has been registered in the gtkTraceSet API. */ static void destroy() { - int i; g_slist_foreach(g_statistic_viewer_data_list, statistic_destroy_walk, NULL ); g_slist_free(g_statistic_viewer_data_list);