From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753543AbeCXUFt (ORCPT ); Sat, 24 Mar 2018 16:05:49 -0400 Received: from mail.kernel.org ([198.145.29.99]:38292 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753492AbeCXUFQ (ORCPT ); Sat, 24 Mar 2018 16:05:16 -0400 DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A62B2178B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=acme@kernel.org From: Arnaldo Carvalho de Melo To: Ingo Molnar Cc: linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Adrian Hunter , Andi Kleen , David Ahern , Jin Yao , Jiri Olsa , Namhyung Kim , Wang Nan Subject: [PATCH 43/44] perf annotate: Defer searching for comma in raw line till it is needed Date: Sat, 24 Mar 2018 17:02:10 -0300 Message-Id: <20180324200211.21326-44-acme@kernel.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180324200211.21326-1-acme@kernel.org> References: <20180324200211.21326-1-acme@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnaldo Carvalho de Melo That strchr() in jump__scnprintf() needs to be nuked somehow, as it, IIRC is already done in jump__parse() and if needed at scnprintf() time, should be stashed in the struct filled in parse() time. For now jus defer it to just before where it is used. Cc: Adrian Hunter Cc: Andi Kleen Cc: David Ahern Cc: Jin Yao Cc: Jiri Olsa Cc: Namhyung Kim Cc: Wang Nan Link: https://lkml.kernel.org/n/tip-j0t5hagnphoz9xw07bh3ha3g@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/annotate.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 5fa270b24eea..f730e0cf8a26 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -350,7 +350,7 @@ static int jump__parse(struct arch *arch __maybe_unused, struct ins_operands *op static int jump__scnprintf(struct ins *ins, char *bf, size_t size, struct ins_operands *ops) { - const char *c = strchr(ops->raw, ','); + const char *c; if (!ops->target.addr || ops->target.offset < 0) return ins__raw_scnprintf(ins, bf, size, ops); @@ -358,6 +358,7 @@ static int jump__scnprintf(struct ins *ins, char *bf, size_t size, if (ops->target.outside && ops->target.sym != NULL) return scnprintf(bf, size, "%-6s %s", ins->name, ops->target.sym->name); + c = strchr(ops->raw, ','); if (c != NULL) { const char *c2 = strchr(c + 1, ','); -- 2.14.3