Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932138AbbHFRaw (ORCPT ); Thu, 6 Aug 2015 13:30:52 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:49885 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755380AbbHFRau (ORCPT ); Thu, 6 Aug 2015 13:30:50 -0400 From: Yannick Brosseau To: CC: , Yannick Brosseau Subject: [PATCH] perf tools: use map->map_ip to get srcline when listing symbol Date: Thu, 6 Aug 2015 10:30:41 -0700 Message-ID: <1438882241-15175-1-git-send-email-scientist@fb.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [192.168.52.123] X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:5.14.151,1.0.33,0.0.0000 definitions=2015-08-06_10:2015-08-06,2015-08-06,1970-01-01 signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1651 Lines: 46 Revert 5550171b2a9f8df26ff483051d060db06376b26d and do the address mapping using map->map_ip instead of map__rip_2objdump when calling get_srcline Signed-off-by: Yannick Brosseau --- tools/perf/util/callchain.c | 4 ++-- tools/perf/util/machine.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 9f643ee..359fb6b 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -830,8 +830,8 @@ char *callchain_list__sym_name(struct callchain_list *cl, if (callchain_param.key == CCKEY_ADDRESS && cl->ms.map && !cl->srcline) cl->srcline = get_srcline(cl->ms.map->dso, - map__rip_2objdump(cl->ms.map, - cl->ip), + cl->ms.map->map_ip(cl->ms.map, + cl->ip), cl->ms.sym, false); if (cl->srcline) printed = scnprintf(bf, bfsize, "%s %s", diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c index 7ff6827..80a5eda 100644 --- a/tools/perf/util/machine.c +++ b/tools/perf/util/machine.c @@ -1580,7 +1580,7 @@ static int add_callchain_ip(struct thread *thread, } } - return callchain_cursor_append(&callchain_cursor, al.addr, al.map, al.sym); + return callchain_cursor_append(&callchain_cursor, ip, al.map, al.sym); } struct branch_info *sample__resolve_bstack(struct perf_sample *sample, -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/