perf sched: Implement the 'perf sched record' subcommand
authorIngo Molnar <mingo@elte.hu>
Sun, 13 Sep 2009 07:44:29 +0000 (09:44 +0200)
committerIngo Molnar <mingo@elte.hu>
Sun, 13 Sep 2009 08:22:51 +0000 (10:22 +0200)
Implement the 'perf sched record' subcommand that adds a
default list of events, turns on raw sampling and system-wide
tracing and passes off the rest of the command to perf record.

This is more convenient than having to specify the events all
the time.

Before:

 $ perf record -a -R -e sched:sched_switch:r -e sched:sched_stat_wait:r -e sched:sched_stat_sleep:r -e sched:sched_stat_iowait:r -e sched:sched_process_exit:r -e sched:sched_process_fork:r -e sched:sched_wakeup:r -e sched:sched_migrate_task:r -c 1 sleep 1

After:

 $ perf sched record -f sleep 1

Also fix an assumption in the event string parser that assumed
that strings passed in can be modified. (In this case they wont
be as they come from a readonly constant section.)

Signed-off-by: Ingo Molnar <mingo@elte.hu>
tools/perf/builtin-sched.c
tools/perf/util/parse-events.c

index b72544f2b964cdcb214cf6974581daabcb4a17b2..ede40c1429a83194c9973b2e29a3801998fd1bde 100644 (file)
@@ -1656,6 +1656,40 @@ static void setup_sorting(void)
        sort_dimension__add((char *)"pid", &cmp_pid);
 }
 
+static const char *record_args[] = {
+       "record",
+       "-a",
+       "-R",
+       "-c", "1",
+       "-e", "sched:sched_switch:r",
+       "-e", "sched:sched_stat_wait:r",
+       "-e", "sched:sched_stat_sleep:r",
+       "-e", "sched:sched_stat_iowait:r",
+       "-e", "sched:sched_process_exit:r",
+       "-e", "sched:sched_process_fork:r",
+       "-e", "sched:sched_wakeup:r",
+       "-e", "sched:sched_migrate_task:r",
+};
+
+static int __cmd_record(int argc, const char **argv)
+{
+       unsigned int rec_argc, i, j;
+       const char **rec_argv;
+
+       rec_argc = ARRAY_SIZE(record_args) + argc - 1;
+       rec_argv = calloc(rec_argc + 1, sizeof(char *));
+
+       for (i = 0; i < ARRAY_SIZE(record_args); i++)
+               rec_argv[i] = strdup(record_args[i]);
+
+       for (j = 1; j < (unsigned int)argc; j++, i++)
+               rec_argv[i] = argv[j];
+
+       BUG_ON(i != rec_argc);
+
+       return cmd_record(i, rec_argv, NULL);
+}
+
 int cmd_sched(int argc, const char **argv, const char *prefix __used)
 {
        symbol__init();
@@ -1666,7 +1700,9 @@ int cmd_sched(int argc, const char **argv, const char *prefix __used)
        if (!argc)
                usage_with_options(sched_usage, sched_options);
 
-       if (!strncmp(argv[0], "lat", 3)) {
+       if (!strncmp(argv[0], "rec", 3)) {
+               return __cmd_record(argc, argv);
+       } else if (!strncmp(argv[0], "lat", 3)) {
                trace_handler = &lat_ops;
                if (argc > 1) {
                        argc = parse_options(argc, argv, latency_options, latency_usage, 0);
@@ -1687,6 +1723,5 @@ int cmd_sched(int argc, const char **argv, const char *prefix __used)
                usage_with_options(sched_usage, sched_options);
        }
 
-
        return 0;
 }
index d06c66cd358b6740454d0fb947db3a345bdb885b..034245e46817ab5da8f089b7e1e9b75d9eced879 100644 (file)
@@ -525,7 +525,8 @@ static enum event_result parse_tracepoint_event(const char **strp,
 
        flags = strchr(evt_name, ':');
        if (flags) {
-               *flags = '\0';
+               /* split it out: */
+               evt_name = strndup(evt_name, flags - evt_name);
                flags++;
        }