Messages in this thread | | | Date | Wed, 18 Jan 2017 14:14:01 +0100 | From | Jiri Olsa <> | Subject | Re: [PATCH v5 2/3] perf tool: add PERF_RECORD_NAMESPACES to include namespaces related info |
| |
On Tue, Jan 17, 2017 at 07:47:38PM +0530, Hari Bathini wrote: > This patch updates perf tool to examine PERF_RECORD_NAMESPACES events > emitted by the kernel when fork, clone, setns or unshare are invoked. > Also, it synthesizes PERF_RECORD_NAMESPACES events for processes that > were running prior to invocation of perf record, the data for which > is taken from /proc/$PID/ns. These changes make way for analyzing > events with regard to namespaces. > > Signed-off-by: Hari Bathini <hbathini@linux.vnet.ibm.com>
could you please rebase this on latest Arnaldo's perf/core? I've got following conflicts:
patching file tools/include/uapi/linux/perf_event.h patching file tools/perf/builtin-annotate.c patching file tools/perf/builtin-diff.c patching file tools/perf/builtin-inject.c patching file tools/perf/builtin-kmem.c Hunk #1 succeeded at 965 (offset 1 line). patching file tools/perf/builtin-kvm.c patching file tools/perf/builtin-lock.c patching file tools/perf/builtin-mem.c patching file tools/perf/builtin-record.c Hunk #1 FAILED at 842. Hunk #2 succeeded at 982 (offset 33 lines). Hunk #3 succeeded at 996 (offset 33 lines). Hunk #4 succeeded at 1515 (offset 109 lines). Hunk #5 succeeded at 1630 (offset 109 lines). 1 out of 5 hunks FAILED -- saving rejects to file tools/perf/builtin-record.c.rej patching file tools/perf/builtin-report.c patching file tools/perf/builtin-sched.c Hunk #1 succeeded at 3272 (offset 105 lines). patching file tools/perf/builtin-script.c Hunk #5 FAILED at 2219. 1 out of 5 hunks FAILED -- saving rejects to file tools/perf/builtin-script.c.rej patching file tools/perf/builtin-trace.c Hunk #1 succeeded at 2415 (offset 1 line). patching file tools/perf/perf.h patching file tools/perf/util/Build patching file tools/perf/util/data-convert-bt.c patching file tools/perf/util/event.c patching file tools/perf/util/event.h patching file tools/perf/util/evsel.c patching file tools/perf/util/machine.c Hunk #2 succeeded at 502 (offset 19 lines). Hunk #3 succeeded at 1570 (offset 19 lines). patching file tools/perf/util/machine.h patching file tools/perf/util/namespaces.c patching file tools/perf/util/namespaces.h patching file tools/perf/util/session.c patching file tools/perf/util/thread.c patching file tools/perf/util/thread.h patching file tools/perf/util/tool.h
thanks, jirka
| |