perf bench: Modify builtin-bench.c for processing common options

This patch modifies builtin-bench.c for processing common
options. The first option added is "--format".
Users of perf bench will be able to specify output style by
--format.

Usage example:

 % ./perf bench sched messaging		# with no style specify
 (20 sender and receiver processes per group)
 (10 groups == 400 processes run)

         Total time:1.431 sec

 % ./perf bench --format=simple sched messaging # specified
 simple 1.431

Signed-off-by: Hitoshi Mitake <mitake@dcl.info.waseda.ac.jp>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
LKML-Reference: <1257808802-9420-3-git-send-email-mitake@dcl.info.waseda.ac.jp>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c
index 31f4164..c7505ea 100644 (file)
--- a/tools/perf/builtin-bench.c
+++ b/tools/perf/builtin-bench.c
@@ -74,53 +74,104 @@ static void dump_suites(int subsys_index)
        return;
 }
 
+static char *bench_format_str;
+int bench_format = BENCH_FORMAT_DEFAULT;
+
+static const struct option bench_options[] = {
+       OPT_STRING('f', "format", &bench_format_str, "default",
+                   "Specify format style"),
+       OPT_END()
+};
+
+static const char * const bench_usage[] = {
+       "perf bench [<common options>] <subsystem> <suite> [<options>]",
+       NULL
+};
+
+static void print_usage(void)
+{
+       int i;
+
+       printf("Usage: \n");
+       for (i = 0; bench_usage[i]; i++)
+               printf("\t%s\n", bench_usage[i]);
+       printf("\n");
+
+       printf("List of available subsystems...\n\n");
+
+       for (i = 0; subsystems[i].name; i++)
+               printf("\t%s: %s\n",
+                      subsystems[i].name, subsystems[i].summary);
+       printf("\n");
+}
+
+static int bench_str2int(char *str)
+{
+       if (!str)
+               return BENCH_FORMAT_DEFAULT;
+
+       if (!strcmp(str, BENCH_FORMAT_DEFAULT_STR))
+               return BENCH_FORMAT_DEFAULT;
+       else if (!strcmp(str, BENCH_FORMAT_SIMPLE_STR))
+               return BENCH_FORMAT_SIMPLE;
+
+       return BENCH_FORMAT_UNKNOWN;
+}
+
 int cmd_bench(int argc, const char **argv, const char *prefix __used)
 {
        int i, j, status = 0;
 
        if (argc < 2) {
                /* No subsystem specified. */
-               printf("Usage: perf bench <subsystem> <suite> [<options>]\n\n");
-               printf("List of available subsystems...\n\n");
+               print_usage();
+               goto end;
+       }
 
-               for (i = 0; subsystems[i].name; i++)
-                       printf("\t%s: %s\n",
-                              subsystems[i].name, subsystems[i].summary);
-               printf("\n");
+       argc = parse_options(argc, argv, bench_options, bench_usage,
+                            PARSE_OPT_STOP_AT_NON_OPTION);
+
+       bench_format = bench_str2int(bench_format_str);
+       if (bench_format == BENCH_FORMAT_UNKNOWN) {
+               printf("Unknown format descriptor:%s\n", bench_format_str);
+               goto end;
+       }
 
+       if (argc < 1) {
+               print_usage();
                goto end;
        }
 
        for (i = 0; subsystems[i].name; i++) {
-               if (strcmp(subsystems[i].name, argv[1]))
+               if (strcmp(subsystems[i].name, argv[0]))
                        continue;
 
-               if (argc < 3) {
+               if (argc < 2) {
                        /* No suite specified. */
                        dump_suites(i);
                        goto end;
                }
 
                for (j = 0; subsystems[i].suites[j].name; j++) {
-                       if (strcmp(subsystems[i].suites[j].name, argv[2]))
+                       if (strcmp(subsystems[i].suites[j].name, argv[1]))
                                continue;
 
-                       status = subsystems[i].suites[j].fn(argc - 2,
-                                                           argv + 2, prefix);
+                       status = subsystems[i].suites[j].fn(argc - 1,
+                                                           argv + 1, prefix);
                        goto end;
                }
 
-               if (!strcmp(argv[2], "-h") || !strcmp(argv[2], "--help")) {
+               if (!strcmp(argv[1], "-h") || !strcmp(argv[1], "--help")) {
                        dump_suites(i);
                        goto end;
                }
 
-               printf("Unknown suite:%s for %s\n", argv[2], argv[1]);
+               printf("Unknown suite:%s for %s\n", argv[1], argv[0]);
                status = 1;
                goto end;
        }
 
-       printf("Unknown subsystem:%s\n", argv[1]);
+       printf("Unknown subsystem:%s\n", argv[0]);
        status = 1;
 
 end: