GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-23 07:12:09 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf callchain: Uninline callchain_cursor_reset() to remove map.h dependency

Browse source 
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>
This commit is contained in:
Arnaldo Carvalho de Melo 2019-01-27 11:55:39 +01:00
parent 4fed072609
commit 7b644f9ad1
4 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tools/perf/ui/gtk/annotate.c
View file

@ -4,6 +4,7 @@
#include "util/debug.h" #include "util/debug.h"
#include "util/annotate.h" #include "util/annotate.h"
#include "util/evsel.h" #include "util/evsel.h"
#include "util/map.h"
#include "ui/helpline.h" #include "ui/helpline.h"
#include <inttypes.h> #include <inttypes.h>
#include <signal.h> #include <signal.h>

1
tools/perf/ui/stdio/hist.c
View file

@ -4,6 +4,7 @@
#include "../../util/util.h" #include "../../util/util.h"
#include "../../util/hist.h" #include "../../util/hist.h"
#include "../../util/map.h"
#include "../../util/sort.h" #include "../../util/sort.h"
#include "../../util/evsel.h" #include "../../util/evsel.h"
#include "../../util/srcline.h" #include "../../util/srcline.h"

15
tools/perf/util/callchain.c
View file

@ -1577,3 +1577,18 @@ int callchain_cursor__copy(struct callchain_cursor *dst,
return rc; 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);
}

18
tools/perf/util/callchain.h
View file

@ -5,10 +5,11 @@
#include <linux/list.h> #include <linux/list.h>
#include <linux/rbtree.h> #include <linux/rbtree.h>
#include "event.h" #include "event.h"
#include "map.h"
#include "symbol.h" #include "symbol.h"
#include "branch.h" #include "branch.h"
struct map;
#define HELP_PAD "\t\t\t\t" #define HELP_PAD "\t\t\t\t"
#define CALLCHAIN_HELP "setup and enables call-graph (stack chain/backtrace):\n\n" #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, int callchain_merge(struct callchain_cursor *cursor,
struct callchain_root *dst, struct callchain_root *src); struct callchain_root *dst, struct callchain_root *src);
/* void callchain_cursor_reset(struct callchain_cursor *cursor);
* 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);
}
int callchain_cursor_append(struct callchain_cursor *cursor, u64 ip, int callchain_cursor_append(struct callchain_cursor *cursor, u64 ip,
struct map *map, struct symbol *sym, struct map *map, struct symbol *sym,