From: Namhyung Kim <namhyung.kim@lge.com>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@elte.hu>,
Namhyung Kim <namhyung@gmail.com>,
LKML <linux-kernel@vger.kernel.org>,
Pekka Enberg <penberg@kernel.org>
Subject: [PATCH 4/7] perf ui: Drop arg[cv] arguments from perf_gtk_setup_browser()
Date: Thu, 29 Mar 2012 15:36:41 +0900 [thread overview]
Message-ID: <1333003004-6391-5-git-send-email-namhyung.kim@lge.com> (raw)
In-Reply-To: <1333003004-6391-1-git-send-email-namhyung.kim@lge.com>
As perf doesn't allow to specify gtk command-line option,
drop the arguments and pass NULL to gtk_init(). This makes
the function easier to be called from setup_browser().
Acked-by: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung.kim@lge.com>
---
tools/perf/builtin-report.c | 2 +-
tools/perf/ui/gtk/browser.c | 5 ++---
tools/perf/util/cache.h | 4 ++--
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 2e317438980b..50a05739091d 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -675,7 +675,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __used)
if (strcmp(report.input_name, "-") != 0) {
if (report.use_gtk)
- perf_gtk_setup_browser(argc, argv, true);
+ perf_gtk_setup_browser(true);
else
setup_browser(true);
} else {
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index d48cef877c96..0112dcbd6e52 100644
--- a/tools/perf/ui/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
@@ -9,10 +9,9 @@
#define MAX_COLUMNS 32
-void perf_gtk_setup_browser(int argc, const char *argv[],
- bool fallback_to_pager __used)
+void perf_gtk_setup_browser(bool fallback_to_pager __used)
{
- gtk_init(&argc, (char ***)&argv);
+ gtk_init(NULL, NULL);
}
void perf_gtk_exit_browser(bool wait_for_ok __used)
diff --git a/tools/perf/util/cache.h b/tools/perf/util/cache.h
index 8dd224df3e54..d22ca689fb15 100644
--- a/tools/perf/util/cache.h
+++ b/tools/perf/util/cache.h
@@ -46,14 +46,14 @@ void exit_browser(bool wait_for_ok);
#endif
#ifdef NO_GTK2_SUPPORT
-static inline void perf_gtk_setup_browser(int argc __used, const char *argv[] __used, bool fallback_to_pager)
+static inline void perf_gtk_setup_browser(bool fallback_to_pager)
{
if (fallback_to_pager)
setup_pager();
}
static inline void perf_gtk_exit_browser(bool wait_for_ok __used) {}
#else
-void perf_gtk_setup_browser(int argc, const char *argv[], bool fallback_to_pager);
+void perf_gtk_setup_browser(bool fallback_to_pager);
void perf_gtk_exit_browser(bool wait_for_ok);
#endif
--
1.7.7.6
next prev parent reply other threads:[~2012-03-29 6:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-29 6:36 [RFC v2 0/7] perf ui: Small preparation for furthure UI work Namhyung Kim
2012-03-29 6:36 ` [PATCH 1/7] perf tools: Move UI bits to tools/perf/ui directory Namhyung Kim
2012-04-02 17:43 ` Pekka Enberg
2012-03-29 6:36 ` [PATCH 2/7] perf tools: Move GTK+ bits to tools/perf/ui/gtk directory Namhyung Kim
2012-04-02 17:41 ` Pekka Enberg
2012-04-04 18:29 ` [PATCH RESEND 2/2] " Namhyung Kim
2012-03-29 6:36 ` [PATCH 3/7] perf ui: Make setup_browser() generic Namhyung Kim
2012-03-29 6:36 ` Namhyung Kim [this message]
2012-03-29 6:36 ` [PATCH 5/7] perf ui/gtk: Rename functions for consistency Namhyung Kim
2012-03-29 6:36 ` [PATCH 6/7] perf ui: Add gtk2 support into setup_browser() Namhyung Kim
2012-03-29 6:36 ` [PATCH 7/7] perf ui: Change fallback policy of setup_browser() Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1333003004-6391-5-git-send-email-namhyung.kim@lge.com \
--to=namhyung.kim@lge.com \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=namhyung@gmail.com \
--cc=paulus@samba.org \
--cc=penberg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®