* Arnaldo Carvalho de Melo <[email protected]> wrote:
> Hi Ingo,
>
> Please consider pulling,
>
> - Arnaldo
>
> Test results at the end of this message, as usual.
>
> The following changes since commit 9df9078ef2086652647248ee6e82ca8f661cb3f5:
>
> perf/amd/uncore: Fix pr_fmt() prefix (2017-04-11 08:44:59 +0200)
>
> are available in the git repository at:
>
> git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git
> tags/perf-core-for-mingo-4.12-20170411
>
> for you to fetch changes up to 986a5bc028a84d487c354a529730b48682d1fb41:
>
> perf annotate: Use stripped line instead of raw disassemble line
> (2017-04-11 16:22:23 -0300)
>
> ----------------------------------------------------------------
> perf/core improvements and fixes:
>
> User visible:
>
> - Support s390 jump instructions in perf annotate (Christian Borntraeger)
>
> - When failing to setup multiple events (e.g. '-e irq_vectors:*'), state
> which one caused the failure (Yao Jin)
>
> - Various fixes for pipe mode, where the output of 'perf record' is
> written to stdout instead of to a perf.data file, fixing workloads
> such as: (David Carrillo-Cisneros)
>
> $ perf record -o - noploop | perf inject -b > perf.data
>
> $ perf record -o - noploop | perf annotate
>
> Infrastructure:
>
> - Simplify ltrim() implementation (Arnaldo Carvalho de Melo)
>
> - Use ltrim() and rtrim() in places where ad-hoc equivalents were being
> used (Taeung Song)
>
> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
>
> ----------------------------------------------------------------
> Arnaldo Carvalho de Melo (3):
> perf callchains: Switch from strtok() to strtok_r() when parsing options
> perf script: Use strtok_r() when parsing output field list
> perf string: Simplify ltrim() implementation
>
> Christian Borntraeger (2):
> perf annotate s390: Fix perf annotate error -95 (4.10 regression)
> perf annotate s390: Implement jump types for perf annotate
>
> David Carrillo-Cisneros (6):
> perf inject: Don't proceed if perf_session__process_event() fails
> perf inject: Copy events when reordering events in pipe mode
> perf tools: Describe pipe mode in perf.data-file-fomat.txt
> perf annotate: Process attr and build_id records
> perf session: Don't rely on evlist in pipe mode
> perf tools: Do not print missing features in pipe-mode
>
> Jin Yao (1):
> perf evsel: Return exact sub event which failed with EPERM for wildcards
>
> Taeung Song (6):
> perf stat: Refactor the code to strip csv output with ltrim()
> perf ui browser: Refactor the code to parse color configs with ltrim()
> perf pmu: Refactor wordwrap() with ltrim()
> perf tools: Refactor the code to strip command name with {l,r}trim()
> perf annotate: Refactor the code to parse disassemble lines with
> {l,r}trim()
> perf annotate: Use stripped line instead of raw disassemble line
>
> tools/perf/Documentation/perf.data-file-format.txt | 19 +++++++-
> tools/perf/arch/s390/annotate/instructions.c | 30 ++++++++++++
> tools/perf/builtin-annotate.c | 2 +
> tools/perf/builtin-inject.c | 2 +
> tools/perf/builtin-script.c | 4 +-
> tools/perf/builtin-stat.c | 10 +---
> tools/perf/ui/browser.c | 2 +-
> tools/perf/util/annotate.c | 54
> +++++++---------------
> tools/perf/util/callchain.c | 4 +-
> tools/perf/util/event.c | 11 +----
> tools/perf/util/evsel.c | 8 +++-
> tools/perf/util/header.c | 3 ++
> tools/perf/util/ordered-events.c | 3 +-
> tools/perf/util/pmu.c | 3 +-
> tools/perf/util/session.c | 17 +++++--
> tools/perf/util/string.c | 6 +--
> 16 files changed, 105 insertions(+), 73 deletions(-)
> create mode 100644 tools/perf/arch/s390/annotate/instructions.c
Pulled, thanks a lot Arnaldo!
Note, there was a conflict in tools/perf/util/annotate.c due to the s390 fix in
perf/urgent. I've fixed it up, but please double check the conflict resolution
I
made in 43d5b075c400.
Thanks,
Ingo
