Merge tag 'for-linus-v3.8-rc1' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / tools / perf / perf.c

diff --git a/tools/perf/perf.c b/tools/perf/perf.c
index 6d50eb0b425196aea150f699cd97ae09b8840ab8..0f661fbce6a8c3d318f20b255a407ed41d54fead 100644 (file)
--- a/tools/perf/perf.c
+++ b/tools/perf/perf.c
@@ -24,6 +24,7 @@ const char perf_more_info_string[] =
 
 int use_browser = -1;
 static int use_pager = -1;
+const char *input_name;
 
 struct cmd_struct {
        const char *cmd;
@@ -84,21 +85,26 @@ int check_pager_config(const char *cmd)
        return c.val;
 }
 
-static int tui_command_config(const char *var, const char *value, void *data)
+static int browser_command_config(const char *var, const char *value, void *data)
 {
        struct pager_config *c = data;
        if (!prefixcmp(var, "tui.") && !strcmp(var + 4, c->cmd))
                c->val = perf_config_bool(var, value);
+       if (!prefixcmp(var, "gtk.") && !strcmp(var + 4, c->cmd))
+               c->val = perf_config_bool(var, value) ? 2 : 0;
        return 0;
 }
 
-/* returns 0 for "no tui", 1 for "use tui", and -1 for "not specified" */
-static int check_tui_config(const char *cmd)
+/*
+ * returns 0 for "no tui", 1 for "use tui", 2 for "use gtk",
+ * and -1 for "not specified"
+ */
+static int check_browser_config(const char *cmd)
 {
        struct pager_config c;
        c.cmd = cmd;
        c.val = -1;
-       perf_config(tui_command_config, &c);
+       perf_config(browser_command_config, &c);
        return c.val;
 }
 
@@ -301,7 +307,7 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
                prefix = NULL; /* setup_perf_directory(); */
 
        if (use_browser == -1)
-               use_browser = check_tui_config(p->cmd);
+               use_browser = check_browser_config(p->cmd);
 
        if (use_pager == -1 && p->option & RUN_SETUP)
                use_pager = check_pager_config(p->cmd);
@@ -440,6 +446,8 @@ int main(int argc, const char **argv)
 {
        const char *cmd;
 
+       page_size = sysconf(_SC_PAGE_SIZE);
+
        cmd = perf_extract_argv0_path(argv[0]);
        if (!cmd)
                cmd = "perf-help";
@@ -481,6 +489,8 @@ int main(int argc, const char **argv)
        }
        cmd = argv[0];
 
+       test_attr__init();
+
        /*
         * We use PATH to find perf commands, but we prepend some higher
         * precedence paths: the "--exec-path" option, the PERF_EXEC_PATH