Hi, Any comments for this patch-set?
I just find a merge conflict with the latest perf/core. Do I need to send the v2 to fix the merge issue right now? Thanks Jin Yao On 8/16/2017 6:18 PM, Jin Yao wrote:
perf record -e cycles,branches ... perf annotate main --stdio The result only shows cycles. It should show both cycles and branches on the left side of annotate view. It works with "--group", but need this to work even without groups. The patch series supports to display multiple events on the left side of annotate view for stdio, tui and gtk modes. Jin Yao (4): perf annotate: create a new hists to manage multiple events samples perf annotate: Display multiple events for stdio mode perf annotate: Display multiple events for tui mode perf annotate: Display multiple events for gtk mode tools/perf/builtin-annotate.c | 62 +++++++++---- tools/perf/builtin-top.c | 3 +- tools/perf/ui/browsers/annotate.c | 49 +++++++--- tools/perf/ui/browsers/hists.c | 2 +- tools/perf/ui/gtk/annotate.c | 35 ++++--- tools/perf/util/annotate.c | 187 +++++++++++++++++++++++++++++--------- tools/perf/util/annotate.h | 16 +++- tools/perf/util/hist.h | 8 +- tools/perf/util/sort.c | 21 +++++ tools/perf/util/sort.h | 13 +++ 10 files changed, 301 insertions(+), 95 deletions(-)