diff options
author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-14 15:52:14 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2014-01-14 15:57:04 -0500 |
commit | 509051ea8427b2f73f065a1b0a1ef871727c9cb2 (patch) | |
tree | f546229f3d82496692d11bcd37df18e78dc50df0 /tools/perf | |
parent | 197749981e539c1eb5863f417de6dd4e2c02b76c (diff) |
perf record: Rename --no-delay to --no-buffering
That is how the option summary describes it and so that we can free
--delay to replace --initial-delay and then be consistent with stat's
--delay equivalent option.
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-f8hd2010uhjl2zzb34hepbmi@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
-rw-r--r-- | tools/perf/Documentation/perf-record.txt | 3 | ||||
-rw-r--r-- | tools/perf/builtin-record.c | 2 | ||||
-rw-r--r-- | tools/perf/builtin-trace.c | 2 | ||||
-rw-r--r-- | tools/perf/perf.h | 2 | ||||
-rw-r--r-- | tools/perf/tests/open-syscall-tp-fields.c | 8 | ||||
-rw-r--r-- | tools/perf/tests/perf-record.c | 6 | ||||
-rw-r--r-- | tools/perf/util/evsel.c | 2 |
7 files changed, 12 insertions, 13 deletions
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index 82bffac036e1..3a35a8523e6d 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt | |||
@@ -68,8 +68,7 @@ OPTIONS | |||
68 | --realtime=:: | 68 | --realtime=:: |
69 | Collect data with this RT SCHED_FIFO priority. | 69 | Collect data with this RT SCHED_FIFO priority. |
70 | 70 | ||
71 | -D:: | 71 | --no-buffering:: |
72 | --no-delay:: | ||
73 | Collect data without buffering. | 72 | Collect data without buffering. |
74 | 73 | ||
75 | -c:: | 74 | -c:: |
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 07d4cf8d3fd3..78e790f4c54f 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -838,7 +838,7 @@ const struct option record_options[] = { | |||
838 | "record events on existing thread id"), | 838 | "record events on existing thread id"), |
839 | OPT_INTEGER('r', "realtime", &record.realtime_prio, | 839 | OPT_INTEGER('r', "realtime", &record.realtime_prio, |
840 | "collect data with this RT SCHED_FIFO priority"), | 840 | "collect data with this RT SCHED_FIFO priority"), |
841 | OPT_BOOLEAN('D', "no-delay", &record.opts.no_delay, | 841 | OPT_BOOLEAN(0, "no-buffering", &record.opts.no_buffering, |
842 | "collect data without buffering"), | 842 | "collect data without buffering"), |
843 | OPT_BOOLEAN('R', "raw-samples", &record.opts.raw_samples, | 843 | OPT_BOOLEAN('R', "raw-samples", &record.opts.raw_samples, |
844 | "collect raw sample records from all opened counters"), | 844 | "collect raw sample records from all opened counters"), |
diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c index 4bd44aba343e..896f27047ed6 100644 --- a/tools/perf/builtin-trace.c +++ b/tools/perf/builtin-trace.c | |||
@@ -2258,7 +2258,7 @@ int cmd_trace(int argc, const char **argv, const char *prefix __maybe_unused) | |||
2258 | }, | 2258 | }, |
2259 | .user_freq = UINT_MAX, | 2259 | .user_freq = UINT_MAX, |
2260 | .user_interval = ULLONG_MAX, | 2260 | .user_interval = ULLONG_MAX, |
2261 | .no_delay = true, | 2261 | .no_buffering = true, |
2262 | .mmap_pages = 1024, | 2262 | .mmap_pages = 1024, |
2263 | }, | 2263 | }, |
2264 | .output = stdout, | 2264 | .output = stdout, |
diff --git a/tools/perf/perf.h b/tools/perf/perf.h index af1ce6e14a93..3c2f213e979d 100644 --- a/tools/perf/perf.h +++ b/tools/perf/perf.h | |||
@@ -252,7 +252,7 @@ struct record_opts { | |||
252 | int call_graph; | 252 | int call_graph; |
253 | bool group; | 253 | bool group; |
254 | bool inherit_stat; | 254 | bool inherit_stat; |
255 | bool no_delay; | 255 | bool no_buffering; |
256 | bool no_inherit; | 256 | bool no_inherit; |
257 | bool no_inherit_set; | 257 | bool no_inherit_set; |
258 | bool no_samples; | 258 | bool no_samples; |
diff --git a/tools/perf/tests/open-syscall-tp-fields.c b/tools/perf/tests/open-syscall-tp-fields.c index 5a016f66f5d2..c505ef2af245 100644 --- a/tools/perf/tests/open-syscall-tp-fields.c +++ b/tools/perf/tests/open-syscall-tp-fields.c | |||
@@ -11,10 +11,10 @@ int test__syscall_open_tp_fields(void) | |||
11 | .uid = UINT_MAX, | 11 | .uid = UINT_MAX, |
12 | .uses_mmap = true, | 12 | .uses_mmap = true, |
13 | }, | 13 | }, |
14 | .no_delay = true, | 14 | .no_buffering = true, |
15 | .freq = 1, | 15 | .freq = 1, |
16 | .mmap_pages = 256, | 16 | .mmap_pages = 256, |
17 | .raw_samples = true, | 17 | .raw_samples = true, |
18 | }; | 18 | }; |
19 | const char *filename = "/etc/passwd"; | 19 | const char *filename = "/etc/passwd"; |
20 | int flags = O_RDONLY | O_DIRECTORY; | 20 | int flags = O_RDONLY | O_DIRECTORY; |
diff --git a/tools/perf/tests/perf-record.c b/tools/perf/tests/perf-record.c index 39cc7c3c0d0c..aca1a83dd13a 100644 --- a/tools/perf/tests/perf-record.c +++ b/tools/perf/tests/perf-record.c | |||
@@ -39,9 +39,9 @@ int test__PERF_RECORD(void) | |||
39 | .uid = UINT_MAX, | 39 | .uid = UINT_MAX, |
40 | .uses_mmap = true, | 40 | .uses_mmap = true, |
41 | }, | 41 | }, |
42 | .no_delay = true, | 42 | .no_buffering = true, |
43 | .freq = 10, | 43 | .freq = 10, |
44 | .mmap_pages = 256, | 44 | .mmap_pages = 256, |
45 | }; | 45 | }; |
46 | cpu_set_t cpu_mask; | 46 | cpu_set_t cpu_mask; |
47 | size_t cpu_mask_size = sizeof(cpu_mask); | 47 | size_t cpu_mask_size = sizeof(cpu_mask); |
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c index cd4630abfa43..22e18a26b7e6 100644 --- a/tools/perf/util/evsel.c +++ b/tools/perf/util/evsel.c | |||
@@ -627,7 +627,7 @@ void perf_evsel__config(struct perf_evsel *evsel, struct record_opts *opts) | |||
627 | if (opts->sample_address) | 627 | if (opts->sample_address) |
628 | perf_evsel__set_sample_bit(evsel, DATA_SRC); | 628 | perf_evsel__set_sample_bit(evsel, DATA_SRC); |
629 | 629 | ||
630 | if (opts->no_delay) { | 630 | if (opts->no_buffering) { |
631 | attr->watermark = 0; | 631 | attr->watermark = 0; |
632 | attr->wakeup_events = 1; | 632 | attr->wakeup_events = 1; |
633 | } | 633 | } |