aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2012-12-21 03:20:14 -0500
committerArnaldo Carvalho de Melo <acme@redhat.com>2013-01-24 14:40:16 -0500
commit6bf1a295a896c8dbe8cad663c6344e8c877a0570 (patch)
tree8370852e2b4c3b0b93bd24f869ba3f9cf35ae85c
parent0da41ce954840a74e7a0de9c8268bf855147e902 (diff)
perf ui/gtk: Setup browser window early
The ui__error/warning functions use gtk infobar or statusbar and pr_* functions use statusbar too. But after perf gtk context created but those infobar and/or statusbar not yet set up, calling one of those functions will get a segment fault. Although current code has no problem, move these setting as early as possible so that it can prevent the segfault from future change. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Cc: Ingo Molnar <mingo@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Pekka Enberg <penberg@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1356078018-31905-3-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
-rw-r--r--tools/perf/ui/gtk/hists.c22
1 files changed, 11 insertions, 11 deletions
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index 26912f86e032..c03da79d524f 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -180,6 +180,17 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,
180 180
181 notebook = gtk_notebook_new(); 181 notebook = gtk_notebook_new();
182 182
183 gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
184
185 info_bar = perf_gtk__setup_info_bar();
186 if (info_bar)
187 gtk_box_pack_start(GTK_BOX(vbox), info_bar, FALSE, FALSE, 0);
188
189 statbar = perf_gtk__setup_statusbar();
190 gtk_box_pack_start(GTK_BOX(vbox), statbar, FALSE, FALSE, 0);
191
192 gtk_container_add(GTK_CONTAINER(window), vbox);
193
183 list_for_each_entry(pos, &evlist->entries, node) { 194 list_for_each_entry(pos, &evlist->entries, node) {
184 struct hists *hists = &pos->hists; 195 struct hists *hists = &pos->hists;
185 const char *evname = perf_evsel__name(pos); 196 const char *evname = perf_evsel__name(pos);
@@ -199,17 +210,6 @@ int perf_evlist__gtk_browse_hists(struct perf_evlist *evlist,
199 gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label); 210 gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window, tab_label);
200 } 211 }
201 212
202 gtk_box_pack_start(GTK_BOX(vbox), notebook, TRUE, TRUE, 0);
203
204 info_bar = perf_gtk__setup_info_bar();
205 if (info_bar)
206 gtk_box_pack_start(GTK_BOX(vbox), info_bar, FALSE, FALSE, 0);
207
208 statbar = perf_gtk__setup_statusbar();
209 gtk_box_pack_start(GTK_BOX(vbox), statbar, FALSE, FALSE, 0);
210
211 gtk_container_add(GTK_CONTAINER(window), vbox);
212
213 gtk_widget_show_all(window); 213 gtk_widget_show_all(window);
214 214
215 perf_gtk__resize_window(window); 215 perf_gtk__resize_window(window);