diff options
Diffstat (limited to 'tools/perf/builtin-record.c')
-rw-r--r-- | tools/perf/builtin-record.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f2624d43333e..6ec0cbc2a5d5 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c | |||
@@ -64,7 +64,7 @@ static void __handle_on_exit_funcs(void) | |||
64 | 64 | ||
65 | struct record { | 65 | struct record { |
66 | struct perf_tool tool; | 66 | struct perf_tool tool; |
67 | struct perf_record_opts opts; | 67 | struct record_opts opts; |
68 | u64 bytes_written; | 68 | u64 bytes_written; |
69 | struct perf_data_file file; | 69 | struct perf_data_file file; |
70 | struct perf_evlist *evlist; | 70 | struct perf_evlist *evlist; |
@@ -178,7 +178,7 @@ static int record__open(struct record *rec) | |||
178 | struct perf_evsel *pos; | 178 | struct perf_evsel *pos; |
179 | struct perf_evlist *evlist = rec->evlist; | 179 | struct perf_evlist *evlist = rec->evlist; |
180 | struct perf_session *session = rec->session; | 180 | struct perf_session *session = rec->session; |
181 | struct perf_record_opts *opts = &rec->opts; | 181 | struct record_opts *opts = &rec->opts; |
182 | int rc = 0; | 182 | int rc = 0; |
183 | 183 | ||
184 | perf_evlist__config(evlist, opts); | 184 | perf_evlist__config(evlist, opts); |
@@ -348,7 +348,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv) | |||
348 | const bool forks = argc > 0; | 348 | const bool forks = argc > 0; |
349 | struct machine *machine; | 349 | struct machine *machine; |
350 | struct perf_tool *tool = &rec->tool; | 350 | struct perf_tool *tool = &rec->tool; |
351 | struct perf_record_opts *opts = &rec->opts; | 351 | struct record_opts *opts = &rec->opts; |
352 | struct perf_evlist *evsel_list = rec->evlist; | 352 | struct perf_evlist *evsel_list = rec->evlist; |
353 | struct perf_data_file *file = &rec->file; | 353 | struct perf_data_file *file = &rec->file; |
354 | struct perf_session *session; | 354 | struct perf_session *session; |
@@ -657,7 +657,7 @@ static int get_stack_size(char *str, unsigned long *_size) | |||
657 | } | 657 | } |
658 | #endif /* HAVE_LIBUNWIND_SUPPORT */ | 658 | #endif /* HAVE_LIBUNWIND_SUPPORT */ |
659 | 659 | ||
660 | int record_parse_callchain(const char *arg, struct perf_record_opts *opts) | 660 | int record_parse_callchain(const char *arg, struct record_opts *opts) |
661 | { | 661 | { |
662 | char *tok, *name, *saveptr = NULL; | 662 | char *tok, *name, *saveptr = NULL; |
663 | char *buf; | 663 | char *buf; |
@@ -713,7 +713,7 @@ int record_parse_callchain(const char *arg, struct perf_record_opts *opts) | |||
713 | return ret; | 713 | return ret; |
714 | } | 714 | } |
715 | 715 | ||
716 | static void callchain_debug(struct perf_record_opts *opts) | 716 | static void callchain_debug(struct record_opts *opts) |
717 | { | 717 | { |
718 | pr_debug("callchain: type %d\n", opts->call_graph); | 718 | pr_debug("callchain: type %d\n", opts->call_graph); |
719 | 719 | ||
@@ -726,7 +726,7 @@ int record_parse_callchain_opt(const struct option *opt, | |||
726 | const char *arg, | 726 | const char *arg, |
727 | int unset) | 727 | int unset) |
728 | { | 728 | { |
729 | struct perf_record_opts *opts = opt->value; | 729 | struct record_opts *opts = opt->value; |
730 | int ret; | 730 | int ret; |
731 | 731 | ||
732 | /* --no-call-graph */ | 732 | /* --no-call-graph */ |
@@ -747,7 +747,7 @@ int record_callchain_opt(const struct option *opt, | |||
747 | const char *arg __maybe_unused, | 747 | const char *arg __maybe_unused, |
748 | int unset __maybe_unused) | 748 | int unset __maybe_unused) |
749 | { | 749 | { |
750 | struct perf_record_opts *opts = opt->value; | 750 | struct record_opts *opts = opt->value; |
751 | 751 | ||
752 | if (opts->call_graph == CALLCHAIN_NONE) | 752 | if (opts->call_graph == CALLCHAIN_NONE) |
753 | opts->call_graph = CALLCHAIN_FP; | 753 | opts->call_graph = CALLCHAIN_FP; |
@@ -796,7 +796,7 @@ const char record_callchain_help[] = CALLCHAIN_HELP "fp"; | |||
796 | /* | 796 | /* |
797 | * XXX Will stay a global variable till we fix builtin-script.c to stop messing | 797 | * XXX Will stay a global variable till we fix builtin-script.c to stop messing |
798 | * with it and switch to use the library functions in perf_evlist that came | 798 | * with it and switch to use the library functions in perf_evlist that came |
799 | * from builtin-record.c, i.e. use perf_record_opts, | 799 | * from builtin-record.c, i.e. use record_opts, |
800 | * perf_evlist__prepare_workload, etc instead of fork+exec'in 'perf record', | 800 | * perf_evlist__prepare_workload, etc instead of fork+exec'in 'perf record', |
801 | * using pipes, etc. | 801 | * using pipes, etc. |
802 | */ | 802 | */ |
@@ -944,7 +944,7 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) | |||
944 | if (perf_evlist__create_maps(evsel_list, &rec->opts.target) < 0) | 944 | if (perf_evlist__create_maps(evsel_list, &rec->opts.target) < 0) |
945 | usage_with_options(record_usage, record_options); | 945 | usage_with_options(record_usage, record_options); |
946 | 946 | ||
947 | if (perf_record_opts__config(&rec->opts)) { | 947 | if (record_opts__config(&rec->opts)) { |
948 | err = -EINVAL; | 948 | err = -EINVAL; |
949 | goto out_free_fd; | 949 | goto out_free_fd; |
950 | } | 950 | } |