From 55046569386a157b55119563f1d6808b7741abe2 Mon Sep 17 00:00:00 2001 From: compudj Date: Thu, 7 Dec 2006 23:02:42 +0000 Subject: [PATCH] 0.8.73, fix gui stats git-svn-id: http://ltt.polymtl.ca/svn@2295 04897980-b3bd-0310-b5e0-8ef037075253 --- ltt/branches/poly/configure.in | 2 +- .../lttv/modules/gui/detailedevents/events.c | 2 +- .../lttv/modules/gui/statistics/statistics.c | 26 ++++++++++++++----- 3 files changed, 22 insertions(+), 8 deletions(-) diff --git a/ltt/branches/poly/configure.in b/ltt/branches/poly/configure.in index 91bd5ffe..03a2c4b9 100644 --- a/ltt/branches/poly/configure.in +++ b/ltt/branches/poly/configure.in @@ -23,7 +23,7 @@ AC_PREREQ(2.57) AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS) #AC_WITH_LTDL # not needed ? -AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.72-06122006) +AM_INIT_AUTOMAKE(LinuxTraceToolkitViewer,0.8.73-07122006) AM_CONFIG_HEADER(config.h) AM_PROG_LIBTOOL diff --git a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c index e8f0c53a..5f4fc90d 100644 --- a/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c +++ b/ltt/branches/poly/lttv/modules/gui/detailedevents/events.c @@ -583,7 +583,7 @@ static void request_background_data(EventViewerData *event_viewer_data) } } else { /* Data ready. By its nature, this viewer doesn't need to have - * its data ready hook called htere, because a background + * its data ready hook called there, because a background * request is always linked with a redraw. */ } diff --git a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c index 8efa6b26..7e781adb 100644 --- a/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c +++ b/ltt/branches/poly/lttv/modules/gui/statistics/statistics.c @@ -115,6 +115,8 @@ struct _StatisticViewerData{ //hash GHashTable *statistic_hash; + + guint background_info_waiting; }; @@ -132,12 +134,16 @@ static gint background_ready(void *hook_data, void *call_data) Tab *tab = svd->tab; LttvTrace *trace = (LttvTrace*)call_data; - g_debug("statistics viewer : background computation data ready."); + svd->background_info_waiting--; + + if(svd->background_info_waiting == 0) { + g_message("statistics viewer : background computation data ready."); - gtk_tree_store_clear (svd->store_m); + gtk_tree_store_clear (svd->store_m); - lttv_stats_sum_traceset(lttvwindow_get_traceset_stats(tab)); - show_traceset_stats(svd); + lttv_stats_sum_traceset(lttvwindow_get_traceset_stats(tab)); + show_traceset_stats(svd); + } return 0; } @@ -153,11 +159,15 @@ static void request_background_data(StatisticViewerData *svd) gint num_traces = lttvwindowtraces_get_number(); gint i; LttvTrace *trace; + GtkTextBuffer* buf; LttvHooks *background_ready_hook = lttv_hooks_new(); lttv_hooks_add(background_ready_hook, background_ready, svd, LTTV_PRIO_DEFAULT); + svd->background_info_waiting = num_traces; + buf = gtk_text_view_get_buffer((GtkTextView*)svd->text_v); + gtk_text_buffer_set_text(buf,"", -1); for(i=0;ibackground_info_waiting = 1; + lttv_hooks_call(background_ready_hook, NULL); + } lttv_hooks_destroy(background_ready_hook); } @@ -431,7 +445,7 @@ void show_traceset_stats(StatisticViewerData * statistic_viewer_data) ts = tscs->parent.parent.ts; nb = lttv_traceset_number(ts); - if(nb == 0)return; + if(nb == 0) return; gtk_tree_store_append (store, &iter, NULL); gtk_tree_store_set (store, &iter, -- 2.34.1