From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754230AbbCGCsN (ORCPT ); Fri, 6 Mar 2015 21:48:13 -0500 Received: from mga11.intel.com ([192.55.52.93]:37012 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752551AbbCGCsJ (ORCPT ); Fri, 6 Mar 2015 21:48:09 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.11,356,1422950400"; d="scan'208";a="661729182" From: Andi Kleen To: arnaldo.melo@gmail.com Cc: linux-kernel@vger.kernel.org, Andi Kleen , Yuanfang Chen Subject: [PATCH] perf, tools, script: Always print raw IP Date: Fri, 6 Mar 2015 18:48:06 -0800 Message-Id: <1425696486-8048-1-git-send-email-andi@firstfloor.org> X-Mailer: git-send-email 1.9.3 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andi Kleen Fix regression caused by 85c116a6cb We did not print the IP anymore for perf script -o ip, but instead symbol+offset, and if there was no symbol only +offset. Print the raw IP correctly again in this case. Reported-by: Yuanfang Chen Cc: Yuanfang Chen Signed-off-by: Andi Kleen --- tools/perf/util/srcline.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c index c93fb0c..7d61f8b 100644 --- a/tools/perf/util/srcline.c +++ b/tools/perf/util/srcline.c @@ -293,8 +293,14 @@ out: dso__free_a2l(dso); } if (sym) { - if (asprintf(&srcline, "%s+%" PRIu64, show_sym ? sym->name : "", - addr - sym->start) < 0) + int err; + + if (show_sym) + err = asprintf(&srcline, "%s+%" PRIu64, sym->name, + addr - sym->start); + else + err = asprintf(&srcline, "%" PRIx64, addr); + if (err < 0) return SRCLINE_UNKNOWN; } else if (asprintf(&srcline, "%s[%" PRIx64 "]", dso->short_name, addr) < 0) return SRCLINE_UNKNOWN; -- 1.9.3