diff options
| author |   Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-01-27 11:55:39 +0100 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2019-02-06 10:00:38 -0300 |
| commit | 7b644f9ad18f74aeac42360bee9c4c1cf874f4c0 (patch) | |
| tree | 70b183c8c15a087a94e39e56193fda27d5af9c15 /tools/perf/util/callchain.h | |
| parent | perf srccode: Move struct definition from map.h to srccode.h (diff) | |
| download | linux-dev-7b644f9ad18f74aeac42360bee9c4c1cf874f4c0.tar.xz linux-dev-7b644f9ad18f74aeac42360bee9c4c1cf874f4c0.zip | |
perf callchain: Uninline callchain_cursor_reset() to remove map.h dependency
That was the only thing that made including map.h in callchain.h a
requiriment, so uninline it and just add a 'struct map' forward
declaration.
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-7fjz4hvv1bpzqaeriku44fn4@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/callchain.h')
| -rw-r--r-- | tools/perf/util/callchain.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/tools/perf/util/callchain.h b/tools/perf/util/callchain.h index 8afe1622edf3..b6f18c2d4b14 100644 --- a/tools/perf/util/callchain.h +++ b/tools/perf/util/callchain.h @@ -5,10 +5,11 @@ #include <linux/list.h> #include <linux/rbtree.h> #include "event.h" -#include "map.h" #include "symbol.h" #include "branch.h" +struct map; + #define HELP_PAD "\t\t\t\t" #define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace):\n\n" @@ -187,20 +188,7 @@ int callchain_append(struct callchain_root *root, int callchain_merge(struct callchain_cursor *cursor, struct callchain_root *dst, struct callchain_root *src); -/* - * Initialize a cursor before adding entries inside, but keep - * the previously allocated entries as a cache. - */ -static inline void callchain_cursor_reset(struct callchain_cursor *cursor) -{ - struct callchain_cursor_node *node; - - cursor->nr = 0; - cursor->last = &cursor->first; - - for (node = cursor->first; node != NULL; node = node->next) - map__zput(node->map); -} +void callchain_cursor_reset(struct callchain_cursor *cursor); int callchain_cursor_append(struct callchain_cursor *cursor, u64 ip, struct map *map, struct symbol *sym, |