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

perf tools: Remove hists from evsel 



Now tools that deals want to have an hists per evsel need to call
hists__init() before creating any evsels, which can be as early as when
parsing the command line, so do it before calling parse_options().

The current tools using hists/hist_entries are report, top and annotate,
change them to request per evsel hists.

This is in preparation for making evsels usable by 3rd party tools, that
not necessarily live in perf's source code repository.

Acked-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Borislav Petkov <bp@suse.de>
Cc: David Ahern <dsahern@gmail.com>
Cc: Don Zickus <dzickus@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Jean Pihet <jean.pihet@linaro.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-usjx2la743f10ippj7p1b20x@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8f651eae

tools/perf/builtin-annotate.c

+4 −1
Original line number Diff line number Diff line
@@ -326,7 +326,10 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
		    "Show event group information together"),

	OPT_END()

	};

	int ret;

	int ret = hists__init();



	if (ret < 0)

		return ret;



	argc = parse_options(argc, argv, options, annotate_usage, 0);

tools/perf/builtin-report.c

+4 −1
Original line number Diff line number Diff line
@@ -568,7 +568,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	struct stat st;

	bool has_br_stack = false;

	int branch_mode = -1;

	int ret = -1;

	char callchain_default_opt[] = "fractal,0.5,callee";

	const char * const report_usage[] = {

		"perf report [<options>]",
@@ -695,6 +694,10 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	struct perf_data_file file = {

		.mode  = PERF_DATA_MODE_READ,

	};

	int ret = hists__init();



	if (ret < 0)

		return ret;



	perf_config(report__config, &report);

tools/perf/builtin-top.c

+4 −1
Original line number Diff line number Diff line
@@ -1047,7 +1047,6 @@ parse_percent_limit(const struct option *opt, const char *arg, 


int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused)

{

	int status = -1;

	char errbuf[BUFSIZ];

	struct perf_top top = {

		.count_filter	     = 5,
@@ -1165,6 +1164,10 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
		"perf top [<options>]",

		NULL

	};

	int status = hists__init();



	if (status < 0)

		return status;



	top.evlist = perf_evlist__new();

	if (top.evlist == NULL)

tools/perf/tests/builtin-test.c

+5 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 
#include <unistd.h>

#include <string.h>

#include "builtin.h"

#include "hist.h"

#include "intlist.h"

#include "tests.h"

#include "debug.h"
@@ -302,6 +303,10 @@ int cmd_test(int argc, const char **argv, const char *prefix __maybe_unused) 
	OPT_END()

	};

	struct intlist *skiplist = NULL;

        int ret = hists__init();



        if (ret < 0)

                return ret;



	argc = parse_options(argc, argv, test_options, test_usage, 0);

	if (argc >= 1 && !strcmp(argv[0], "list"))

tools/perf/util/evsel.c

+0 −11
Original line number Diff line number Diff line
@@ -159,16 +159,6 @@ void perf_evsel__calc_id_pos(struct perf_evsel *evsel) 
	evsel->is_pos = __perf_evsel__calc_is_pos(evsel->attr.sample_type);

}



void hists__init(struct hists *hists)

{

	memset(hists, 0, sizeof(*hists));

	hists->entries_in_array[0] = hists->entries_in_array[1] = RB_ROOT;

	hists->entries_in = &hists->entries_in_array[0];

	hists->entries_collapsed = RB_ROOT;

	hists->entries = RB_ROOT;

	pthread_mutex_init(&hists->lock, NULL);

}



void __perf_evsel__set_sample_bit(struct perf_evsel *evsel,

				  enum perf_event_sample_format bit)

{
@@ -211,7 +201,6 @@ void perf_evsel__init(struct perf_evsel *evsel, 
	evsel->unit	   = "";

	evsel->scale	   = 1.0;

	INIT_LIST_HEAD(&evsel->node);

	hists__init(&evsel->hists);

	perf_evsel__object.init(evsel);

	evsel->sample_size = __perf_evsel__sample_size(attr->sample_type);

	perf_evsel__calc_id_pos(evsel);

CRA Git | Maintained and supported by SUSTech CRA and CCSE