Hi, On 09.01.2019 19:58, Jiri Olsa wrote: > On Mon, Dec 24, 2018 at 04:45:21PM +0300, Alexey Budankov wrote: >> >> Introduce --compression_level=n, --mmap-flush options and >> PERF_RECORD_COMPRESSED >> event record that contains compressed parts of mmap kernel buffer data. >> >> Signed-off-by: Alexey Budankov <[email protected]> >> --- >> tools/perf/Documentation/perf-record.txt | 11 +++ >> tools/perf/builtin-record.c | 97 ++++++++++++++++++++---- >> tools/perf/perf.h | 2 + >> tools/perf/util/env.h | 10 +++ >> tools/perf/util/event.c | 1 + >> tools/perf/util/event.h | 7 ++ >> tools/perf/util/evlist.c | 6 +- >> tools/perf/util/evlist.h | 2 +- >> tools/perf/util/header.c | 47 +++++++++++- >> tools/perf/util/header.h | 1 + >> tools/perf/util/mmap.c | 4 +- >> tools/perf/util/mmap.h | 3 +- >> 12 files changed, 169 insertions(+), 22 deletions(-) > > also I'm getting here similar error (like for the affinity patchset)
Really weird. Hopefully it can be resolved in the next version of the patch set. Thanks, Alexey > > [jolsa@krava perf]$ git am /tmp/comp > Applying: feature: build libzstd feature check, LIBZSTD_DIR and NO_LIBZSTD > defines > Applying: perf record: introduce z, mmap-flush options and > PERF_RECORD_COMPRESSED record > error: corrupt patch at line 526 > Patch failed at 0002 perf record: introduce z, mmap-flush options and > PERF_RECORD_COMPRESSED record > > again the raw patch applies correctly: > > [jolsa@krava perf]$ patch -p3 < /tmp/comp2 > patching file Documentation/perf-record.txt > patching file builtin-record.c > patching file perf.h > patching file util/env.h > patching file util/event.c > patching file util/event.h > patching file util/evlist.c > patching file util/evlist.h > patching file util/header.c > patching file util/header.h > patching file util/mmap.c > patching file util/mmap.h > > > jirka >
