diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-14 15:58:12 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-14 15:58:12 -0500 |
commit | a6205a35ba2d56dcfb79b08cc11b8c7d549826aa (patch) | |
tree | e8f284ebe6f9e3dd11e1712e6513d27cd1cc1b81 /tools | |
parent | 509051ea8427b2f73f065a1b0a1ef871727c9cb2 (diff) |
perf record: Rename --initial-delay to --delay
To be consistent with the equivalent option in 'stat', also, for the
same reason, use -D as the one letter alias.
Suggested-by: Ingo Molnar <mingo@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-p5yjnopajb3a8x0xha7yl5w8@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/perf/Documentation/perf-record.txt | 3 | ||||
-rw-r--r-- | tools/perf/builtin-record.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index 3a35a8523e6d..c71b0f36d9e8 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt | |||
@@ -208,7 +208,8 @@ overrides that and uses per-thread mmaps. A side-effect of that is that | |||
208 | inheritance is automatically disabled. --per-thread is ignored with a warning | 208 | inheritance is automatically disabled. --per-thread is ignored with a warning |
209 | if combined with -a or -C options. | 209 | if combined with -a or -C options. |
210 | 210 | ||
211 | --initial-delay msecs:: | 211 | -D:: |
212 | --delay=:: | ||
212 | After starting the program, wait msecs before measuring. This is useful to | 213 | After starting the program, wait msecs before measuring. This is useful to |
213 | filter out the startup phase of the program, which is often very different. | 214 | filter out the startup phase of the program, which is often very different. |
214 | 215 | ||
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 78e790f4c54f..3c394bf16fa8 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -882,7 +882,7 @@ const struct option record_options[] = { | |||
882 | OPT_CALLBACK('G', "cgroup", &record.evlist, "name", | 882 | OPT_CALLBACK('G', "cgroup", &record.evlist, "name", |
883 | "monitor event in cgroup name only", | 883 | "monitor event in cgroup name only", |
884 | parse_cgroups), | 884 | parse_cgroups), |
885 | OPT_UINTEGER(0, "initial-delay", &record.opts.initial_delay, | 885 | OPT_UINTEGER('D', "delay", &record.opts.initial_delay, |
886 | "ms to wait before starting measurement after program start"), | 886 | "ms to wait before starting measurement after program start"), |
887 | OPT_STRING('u', "uid", &record.opts.target.uid_str, "user", | 887 | OPT_STRING('u', "uid", &record.opts.target.uid_str, "user", |
888 | "user to profile"), | 888 | "user to profile"), |