[PATCH v1 06/10] perf: Add plumbling for line/disc for inlines

[Andi Kleen <ak@linux.intel.com>]

When resolving inlines save the line number and the discriminator for
later use. The line number is already in the string, but it's more
convenient to have it as a integer too. Used in future patches.

Signed-off-by: Andi Kleen <ak@linux.intel.com>
---
 tools/perf/util/srcline.c | 18 ++++++++++++------
 tools/perf/util/srcline.h |  2 ++
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/tools/perf/util/srcline.c b/tools/perf/util/srcline.c
index 07df410b52e4..0b11e3fe3f11 100644
--- a/tools/perf/util/srcline.c
+++ b/tools/perf/util/srcline.c
@@ -46,6 +46,7 @@ static const char *srcline_dso_name(struct dso *dso)
 }
 
 static int inline_list__append(struct symbol *symbol, char *srcline,
+			       int line, int disc,
 			       struct inline_node *node)
 {
 	struct inline_list *ilist;
@@ -56,6 +57,8 @@ static int inline_list__append(struct symbol *symbol, char *srcline,
 
 	ilist->symbol = symbol;
 	ilist->srcline = srcline;
+	ilist->disc = disc;
+	ilist->line = line;
 
 	if (callchain_param.order == ORDER_CALLEE)
 		list_add_tail(&ilist->list, &node->val);
@@ -297,7 +300,8 @@ static int inline_list__append_dso_a2l(struct dso *dso,
 	if (a2l->filename)
 		srcline = srcline_from_fileline(a2l->filename, a2l->line);
 
-	return inline_list__append(inline_sym, srcline, node);
+	return inline_list__append(inline_sym, srcline, a2l->line,
+				   a2l->discriminator, node);
 }
 
 static int addr2line(const char *dso_name, u64 addr,
@@ -636,11 +640,12 @@ static int inline_list__append_record(struct dso *dso,
 				      struct symbol *sym,
 				      const char *function,
 				      const char *filename,
-				      unsigned int line_nr)
+				      unsigned int line_nr,
+				      unsigned int disc)
 {
 	struct symbol *inline_sym = new_inline_sym(dso, sym, function);
 
-	return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), node);
+	return inline_list__append(inline_sym, srcline_from_fileline(filename, line_nr), line_nr, disc, node);
 }
 
 static int addr2line(const char *dso_name, u64 addr,
@@ -750,7 +755,8 @@ static int addr2line(const char *dso_name, u64 addr,
 		if (node && inline_list__append_record(dso, node, sym,
 						       record_function,
 						       record_filename,
-						       record_line_nr)) {
+						       record_line_nr,
+						       disc)) {
 			ret = 0;
 			goto out;
 		}
@@ -768,12 +774,12 @@ static int addr2line(const char *dso_name, u64 addr,
 						      /*first=*/false,
 						      &record_function,
 						      &record_filename,
-						      &record_line_nr, NULL)) == 1) {
+						      &record_line_nr, &disc)) == 1) {
 		if (unwind_inlines && node && inline_count++ < MAX_INLINE_NEST) {
 			if (inline_list__append_record(dso, node, sym,
 						       record_function,
 						       record_filename,
-						       record_line_nr)) {
+						       record_line_nr, disc)) {
 				ret = 0;
 				goto out;
 			}
diff --git a/tools/perf/util/srcline.h b/tools/perf/util/srcline.h
index d2cb90b1177e..5d37fcc7c02c 100644
--- a/tools/perf/util/srcline.h
+++ b/tools/perf/util/srcline.h
@@ -32,6 +32,8 @@ extern char *srcline__unknown;
 struct inline_list {
 	struct symbol		*symbol;
 	char			*srcline;
+	int			line;
+	int			disc;
 	struct list_head	list;
 };
 
-- 
2.45.2