Commit 7b644f9a authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 4fed0726

tools/perf/ui/gtk/annotate.c

+1 −0
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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,

CRA Git | Maintained and supported by SUSTech CRA and CCSE