perf callchain: Uninline callchain_cursor_reset() to remove map.h dependency
tip-bot for Arnaldo Carvalho de Melo
merge botCommit-ID: 7b644f9ad18f74aeac42360bee9c4c1cf874f4c0 Gitweb: https://git.kernel.org/tip/7b644f9ad18f74aeac42360bee9c4c1cf874f4c0 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sun, 27 Jan 2019 11:55:39 +0100 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 6 Feb 2019 10:00:38 -0300
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 <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/ui/gtk/annotate.c | 1 + tools/perf/ui/stdio/hist.c | 1 + tools/perf/util/callchain.c | 15 +++++++++++++++ tools/perf/util/callchain.h | 18 +++--------------- 4 files changed, 20 insertions(+), 15 deletions(-)
tools/perf/ui/gtk/annotate.c +1 -0
@@ -4,6 +4,7 @@#include "util/debug.h" #include "util/annotate.h" #include "util/evsel.h" +#include "util/map.h" #include "ui/helpline.h" #include <inttypes.h> #include <signal.h>
tools/perf/ui/stdio/hist.c +1 -0
@@ -4,6 +4,7 @@#include "../../util/util.h" #include "../../util/hist.h" +#include "../../util/map.h" #include "../../util/sort.h" #include "../../util/evsel.h" #include "../../util/srcline.h"
tools/perf/util/callchain.c +15 -0
@@ -1577,3 +1577,18 @@ int callchain_cursor__copy(struct callchain_cursor *dst,return rc; } + +/* +* Initialize a cursor before adding entries inside, but keep +* the previously allocated entries as a cache. +*/ +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); +}
tools/perf/util/callchain.h +3 -15
@@ -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,