Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1399887

[tip:perf/core] perf symbols: Add dso__insert_symbol function

Show all headers | View raw

Commit-ID:  ae93a6c70838b87151ac12589dc507dbf4f2f067
Gitweb:     http://git.kernel.org/tip/ae93a6c70838b87151ac12589dc507dbf4f2f067
Author:     Chris Phlipot <cphlipot0@gmail.com>
AuthorDate: Tue, 10 May 2016 20:26:46 -0700
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 11 May 2016 12:24:57 -0300

perf symbols: Add dso__insert_symbol function

The current method for inserting symbols is to use the symbols__insert()
function. However symbols__insert() does not update the dso symbol
cache.  This causes problems in the following scenario:

1. symbol not found at addr using dso__find_symbol

2. symbol inserted at addr using the existing symbols__insert function

3. symbol still not found at addr using dso__find_symbol() because cache isn't
   updated. This is undesired behavior.

The undesired behavior in (3) is addressed by creating a new function,
dso__insert_symbol() to both insert the symbol and update the symbol
cache if necessary.

If dso__insert_symbol() is used in (2) instead of symbols__insert(),
then the undesired behavior in (3) is avoided.

Signed-off-by: Chris Phlipot <cphlipot0@gmail.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1462937209-6032-2-git-send-email-cphlipot0@gmail.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/util/symbol.c | 12 ++++++++++++
 tools/perf/util/symbol.h |  3 +++
 2 files changed, 15 insertions(+)

diff --git a/tools/perf/util/symbol.c b/tools/perf/util/symbol.c
index 2946295..21af8e8 100644
--- a/tools/perf/util/symbol.c
+++ b/tools/perf/util/symbol.c
@@ -413,6 +413,18 @@ void dso__reset_find_symbol_cache(struct dso *dso)
 	}
 }
 
+void dso__insert_symbol(struct dso *dso, enum map_type type, struct symbol *sym)
+{
+	symbols__insert(&dso->symbols[type], sym);
+
+	/* update the symbol cache if necessary */
+	if (dso->last_find_result[type].addr >= sym->start &&
+	    (dso->last_find_result[type].addr < sym->end ||
+	    sym->start == sym->end)) {
+		dso->last_find_result[type].symbol = sym;
+	}
+}
+
 struct symbol *dso__find_symbol(struct dso *dso,
 				enum map_type type, u64 addr)
 {
diff --git a/tools/perf/util/symbol.h b/tools/perf/util/symbol.h
index 07211c2..2b5e4ed 100644
--- a/tools/perf/util/symbol.h
+++ b/tools/perf/util/symbol.h
@@ -246,6 +246,9 @@ int __dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map,
 int dso__load_kallsyms(struct dso *dso, const char *filename, struct map *map,
 		       symbol_filter_t filter);
 
+void dso__insert_symbol(struct dso *dso, enum map_type type,
+			struct symbol *sym);
+
 struct symbol *dso__find_symbol(struct dso *dso, enum map_type type,
 				u64 addr);
 struct symbol *dso__find_symbol_by_name(struct dso *dso, enum map_type type,

Back to linux.kernel | Previous | Next — Previous in thread | Find similar | Unroll thread

Thread

[PATCH v2 0/4] perf script: fix duplicate symbols in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
  [PATCH v2 2/4] perf script: fix symbol insertion behavior in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf script: Fix symbol insertion behavior in  db-export tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200
  [PATCH v2 4/4] perf script: fix export of callchains with recursion in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf script: Fix export of callchains with  recursion in db-export tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200
  [PATCH v2 3/4] perf script: fix callchain addresses in db-export Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf script: Fix callchain addresses in db-export tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200
  [PATCH v2 1/4] perf symbols: add dso__insert_symbol function Chris Phlipot <cphlipot0@gmail.com> - 2016-05-11 05:30 +0200
    [tip:perf/core] perf symbols: Add dso__insert_symbol function tip-bot for Chris Phlipot <tipbot@zytor.com> - 2016-05-12 12:30 +0200

csiph-web