diff options
| author | Jiri Olsa <jolsa@redhat.com> | 2013-06-05 07:37:21 -0400 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-07-08 16:37:25 -0400 |
| commit | 4a4d371a4dfbd3b84a7eab8d535d4c7c3647b09e (patch) | |
| tree | 146826970a6dba294ad9e3bc0ab40b1983e48e48 /tools | |
| parent | 563aecb2e63a16f86c7daabfdcfee23f3e7c5955 (diff) | |
perf record: Remove -f/--force option
It no longer have any affect on the processing and is marked as obsolete
anyway.
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/n/tip-tvwyspiqr4getzfib2lw06ty@git.kernel.org
Link: http://lkml.kernel.org/r/1372307120-737-1-git-send-email-namhyung@kernel.org
[ combined patch removing the -f usage in various sub-commands, such as 'perf sched', etc, by Namhyung Kim ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/perf/Documentation/examples.txt | 4 | ||||
| -rw-r--r-- | tools/perf/Documentation/perf-record.txt | 4 | ||||
| -rw-r--r-- | tools/perf/builtin-kmem.c | 2 | ||||
| -rw-r--r-- | tools/perf/builtin-lock.c | 2 | ||||
| -rw-r--r-- | tools/perf/builtin-record.c | 3 | ||||
| -rw-r--r-- | tools/perf/builtin-sched.c | 1 | ||||
| -rw-r--r-- | tools/perf/builtin-timechart.c | 4 |
7 files changed, 6 insertions, 14 deletions
diff --git a/tools/perf/Documentation/examples.txt b/tools/perf/Documentation/examples.txt index 77f952762426..a4e392156488 100644 --- a/tools/perf/Documentation/examples.txt +++ b/tools/perf/Documentation/examples.txt | |||
| @@ -66,7 +66,7 @@ Furthermore, these tracepoints can be used to sample the workload as | |||
| 66 | well. For example the page allocations done by a 'git gc' can be | 66 | well. For example the page allocations done by a 'git gc' can be |
| 67 | captured the following way: | 67 | captured the following way: |
| 68 | 68 | ||
| 69 | titan:~/git> perf record -f -e kmem:mm_page_alloc -c 1 ./git gc | 69 | titan:~/git> perf record -e kmem:mm_page_alloc -c 1 ./git gc |
| 70 | Counting objects: 1148, done. | 70 | Counting objects: 1148, done. |
| 71 | Delta compression using up to 2 threads. | 71 | Delta compression using up to 2 threads. |
| 72 | Compressing objects: 100% (450/450), done. | 72 | Compressing objects: 100% (450/450), done. |
| @@ -120,7 +120,7 @@ Furthermore, call-graph sampling can be done too, of page | |||
| 120 | allocations - to see precisely what kind of page allocations there | 120 | allocations - to see precisely what kind of page allocations there |
| 121 | are: | 121 | are: |
| 122 | 122 | ||
| 123 | titan:~/git> perf record -f -g -e kmem:mm_page_alloc -c 1 ./git gc | 123 | titan:~/git> perf record -g -e kmem:mm_page_alloc -c 1 ./git gc |
| 124 | Counting objects: 1148, done. | 124 | Counting objects: 1148, done. |
| 125 | Delta compression using up to 2 threads. | 125 | Delta compression using up to 2 threads. |
| 126 | Compressing objects: 100% (450/450), done. | 126 | Compressing objects: 100% (450/450), done. |
diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index 7e3258066bc9..e297b74471b8 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt | |||
| @@ -70,10 +70,6 @@ OPTIONS | |||
| 70 | --no-delay:: | 70 | --no-delay:: |
| 71 | Collect data without buffering. | 71 | Collect data without buffering. |
| 72 | 72 | ||
| 73 | -f:: | ||
| 74 | --force:: | ||
| 75 | Overwrite existing data file. (deprecated) | ||
| 76 | |||
| 77 | -c:: | 73 | -c:: |
| 78 | --count=:: | 74 | --count=:: |
| 79 | Event period to sample. | 75 | Event period to sample. |
diff --git a/tools/perf/builtin-kmem.c b/tools/perf/builtin-kmem.c index 46878daca5cc..0259502638b4 100644 --- a/tools/perf/builtin-kmem.c +++ b/tools/perf/builtin-kmem.c | |||
| @@ -708,7 +708,7 @@ static int parse_line_opt(const struct option *opt __maybe_unused, | |||
| 708 | static int __cmd_record(int argc, const char **argv) | 708 | static int __cmd_record(int argc, const char **argv) |
| 709 | { | 709 | { |
| 710 | const char * const record_args[] = { | 710 | const char * const record_args[] = { |
| 711 | "record", "-a", "-R", "-f", "-c", "1", | 711 | "record", "-a", "-R", "-c", "1", |
| 712 | "-e", "kmem:kmalloc", | 712 | "-e", "kmem:kmalloc", |
| 713 | "-e", "kmem:kmalloc_node", | 713 | "-e", "kmem:kmalloc_node", |
| 714 | "-e", "kmem:kfree", | 714 | "-e", "kmem:kfree", |
diff --git a/tools/perf/builtin-lock.c b/tools/perf/builtin-lock.c index 425830069749..76543a4a7a30 100644 --- a/tools/perf/builtin-lock.c +++ b/tools/perf/builtin-lock.c | |||
| @@ -878,7 +878,7 @@ static int __cmd_report(void) | |||
| 878 | static int __cmd_record(int argc, const char **argv) | 878 | static int __cmd_record(int argc, const char **argv) |
| 879 | { | 879 | { |
| 880 | const char *record_args[] = { | 880 | const char *record_args[] = { |
| 881 | "record", "-R", "-f", "-m", "1024", "-c", "1", | 881 | "record", "-R", "-m", "1024", "-c", "1", |
| 882 | }; | 882 | }; |
| 883 | unsigned int rec_argc, i, j; | 883 | unsigned int rec_argc, i, j; |
| 884 | const char **rec_argv; | 884 | const char **rec_argv; |
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 2990570b5c6d..ecca62e27b28 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
| @@ -74,7 +74,6 @@ struct perf_record { | |||
| 74 | int realtime_prio; | 74 | int realtime_prio; |
| 75 | bool no_buildid; | 75 | bool no_buildid; |
| 76 | bool no_buildid_cache; | 76 | bool no_buildid_cache; |
| 77 | bool force; | ||
| 78 | long samples; | 77 | long samples; |
| 79 | off_t post_processing_offset; | 78 | off_t post_processing_offset; |
| 80 | }; | 79 | }; |
| @@ -856,8 +855,6 @@ const struct option record_options[] = { | |||
| 856 | "system-wide collection from all CPUs"), | 855 | "system-wide collection from all CPUs"), |
| 857 | OPT_STRING('C', "cpu", &record.opts.target.cpu_list, "cpu", | 856 | OPT_STRING('C', "cpu", &record.opts.target.cpu_list, "cpu", |
| 858 | "list of cpus to monitor"), | 857 | "list of cpus to monitor"), |
| 859 | OPT_BOOLEAN('f', "force", &record.force, | ||
| 860 | "overwrite existing data file (deprecated)"), | ||
| 861 | OPT_U64('c', "count", &record.opts.user_interval, "event period to sample"), | 858 | OPT_U64('c', "count", &record.opts.user_interval, "event period to sample"), |
| 862 | OPT_STRING('o', "output", &record.output_name, "file", | 859 | OPT_STRING('o', "output", &record.output_name, "file", |
| 863 | "output file name"), | 860 | "output file name"), |
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c index 2da2a6ca22bf..fed9ae432c16 100644 --- a/tools/perf/builtin-sched.c +++ b/tools/perf/builtin-sched.c | |||
| @@ -1632,7 +1632,6 @@ static int __cmd_record(int argc, const char **argv) | |||
| 1632 | "record", | 1632 | "record", |
| 1633 | "-a", | 1633 | "-a", |
| 1634 | "-R", | 1634 | "-R", |
| 1635 | "-f", | ||
| 1636 | "-m", "1024", | 1635 | "-m", "1024", |
| 1637 | "-c", "1", | 1636 | "-c", "1", |
| 1638 | "-e", "sched:sched_switch", | 1637 | "-e", "sched:sched_switch", |
diff --git a/tools/perf/builtin-timechart.c b/tools/perf/builtin-timechart.c index ab4cf232b852..4536a92b18f3 100644 --- a/tools/perf/builtin-timechart.c +++ b/tools/perf/builtin-timechart.c | |||
| @@ -1005,7 +1005,7 @@ static int __cmd_record(int argc, const char **argv) | |||
| 1005 | { | 1005 | { |
| 1006 | #ifdef SUPPORT_OLD_POWER_EVENTS | 1006 | #ifdef SUPPORT_OLD_POWER_EVENTS |
| 1007 | const char * const record_old_args[] = { | 1007 | const char * const record_old_args[] = { |
| 1008 | "record", "-a", "-R", "-f", "-c", "1", | 1008 | "record", "-a", "-R", "-c", "1", |
| 1009 | "-e", "power:power_start", | 1009 | "-e", "power:power_start", |
| 1010 | "-e", "power:power_end", | 1010 | "-e", "power:power_end", |
| 1011 | "-e", "power:power_frequency", | 1011 | "-e", "power:power_frequency", |
| @@ -1014,7 +1014,7 @@ static int __cmd_record(int argc, const char **argv) | |||
| 1014 | }; | 1014 | }; |
| 1015 | #endif | 1015 | #endif |
| 1016 | const char * const record_new_args[] = { | 1016 | const char * const record_new_args[] = { |
| 1017 | "record", "-a", "-R", "-f", "-c", "1", | 1017 | "record", "-a", "-R", "-c", "1", |
| 1018 | "-e", "power:cpu_frequency", | 1018 | "-e", "power:cpu_frequency", |
| 1019 | "-e", "power:cpu_idle", | 1019 | "-e", "power:cpu_idle", |
| 1020 | "-e", "sched:sched_wakeup", | 1020 | "-e", "sched:sched_wakeup", |
