diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-18 10:06:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-18 10:06:20 +0100 |
| commit | 9f6f941e25bad8fcffc24d10762962d62edba767 (patch) | |
| tree | d042a94389809137f8957fc6e47fb1b491c85e3c /tools/perf/builtin-script.c | |
| parent | 5b485629ba0d5d027880769ff467c587b24b4bde (diff) | |
| parent | d94386f28abad0c5879f0760712e34e71f88a7da (diff) | |
| download | op-kernel-dev-9f6f941e25bad8fcffc24d10762962d62edba767.zip op-kernel-dev-9f6f941e25bad8fcffc24d10762962d62edba767.tar.gz | |
Merge tag 'perf-core-for-mingo-4.11-20170117' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core
Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:
New features:
- Account thread wait time (off CPU time) separately: sleep, iowait and
preempt, based on the prev_state of the last event, show the breakdown
when using "perf sched timehist --state" (Namhyumg Kim)
Infrastructure changes:
- Factor out PMU scale conversion code (Andi Kleen)
- Remove unnecessary feature-dwarf warning (David Carrillo-Cisneros)
- Add missing member name in OPT_() macros (Soramichi AKIYAMA)
- Move variables referenced in libperf.a object files from perf's main()
file, so that other tools can use libperf.a with a different main()
(Soramichi AKIYAMA)
Documentation changes:
- Fix 'perf script' man page about --dump-raw-trace option (Michael Petlan)
- Also allow forcing reading of non-root owned files by root in 'perf
script' (Yannick Brosseau)
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/perf/builtin-script.c')
| -rw-r--r-- | tools/perf/builtin-script.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 2f3ff69..c0783b4 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c @@ -2180,7 +2180,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) "Show the mmap events"), OPT_BOOLEAN('\0', "show-switch-events", &script.show_switch_events, "Show context switch events (if recorded)"), - OPT_BOOLEAN('f', "force", &file.force, "don't complain, do it"), + OPT_BOOLEAN('f', "force", &symbol_conf.force, "don't complain, do it"), OPT_BOOLEAN(0, "ns", &nanosecs, "Use 9 decimal places when displaying time"), OPT_CALLBACK_OPTARG(0, "itrace", &itrace_synth_opts, NULL, "opts", @@ -2212,6 +2212,7 @@ int cmd_script(int argc, const char **argv, const char *prefix __maybe_unused) PARSE_OPT_STOP_AT_NON_OPTION); file.path = input_name; + file.force = symbol_conf.force; if (argc > 1 && !strncmp(argv[0], "rec", strlen("rec"))) { rec_script_path = get_script_path(argv[1], RECORD_SUFFIX); |
