Commit c448234c authored Mar 23, 2018 by Arnaldo Carvalho de Melo

perf annotate: Defer searching for comma in raw line till it is needed

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 <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: https://lkml.kernel.org/n/tip-j0t5hagnphoz9xw07bh3ha3g@git.kernel.org

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent e4cc91b8

tools/perf/util/annotate.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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, ',');