From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755061AbdIHHdI (ORCPT ); Fri, 8 Sep 2017 03:33:08 -0400 Received: from mga09.intel.com ([134.134.136.24]:12934 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754655AbdIHHdH (ORCPT ); Fri, 8 Sep 2017 03:33:07 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.42,360,1500966000"; d="scan'208";a="1192897825" Subject: Re: [PATCH v1 0/4] perf annotate: Display multiple events on the left side of annotate view To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com References: <1502878716-30817-1-git-send-email-yao.jin@linux.intel.com> From: "Jin, Yao" Message-ID: <63100008-c4fb-3627-d3a3-5062413c98ba@linux.intel.com> Date: Fri, 8 Sep 2017 15:31:54 +0800 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:52.0) Gecko/20100101 Thunderbird/52.2.1 MIME-Version: 1.0 In-Reply-To: <1502878716-30817-1-git-send-email-yao.jin@linux.intel.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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(-) >