Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b65855e authored by Jiri Olsa's avatar Jiri Olsa Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add hpp_list into struct hists object 



Adding hpp_list into struct hists object.

Initializing struct hists_evsel hists object to carry global
perf_hpp_list list.

Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1453109064-1026-25-git-send-email-jolsa@kernel.org


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

tools/perf/util/hist.c

+3 −2
Original line number Diff line number Diff line
@@ -1578,7 +1578,7 @@ int perf_hist_config(const char *var, const char *value) 
	return 0;

}



int __hists__init(struct hists *hists)

int __hists__init(struct hists *hists, struct perf_hpp_list *hpp_list)

{

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

	hists->entries_in_array[0] = hists->entries_in_array[1] = RB_ROOT;
@@ -1587,6 +1587,7 @@ int __hists__init(struct hists *hists) 
	hists->entries = RB_ROOT;

	pthread_mutex_init(&hists->lock, NULL);

	hists->socket_filter = -1;

	hists->hpp_list = hpp_list;

	return 0;

}
@@ -1623,7 +1624,7 @@ static int hists_evsel__init(struct perf_evsel *evsel) 
{

	struct hists *hists = evsel__hists(evsel);



	__hists__init(hists);

	__hists__init(hists, &perf_hpp_list);

	return 0;

}

tools/perf/util/hist.h

+2 −1
Original line number Diff line number Diff line
@@ -75,6 +75,7 @@ struct hists { 
	u64			event_stream;

	u16			col_len[HISTC_NR_COLS];

	int			socket_filter;

	struct perf_hpp_list	*hpp_list;

};



struct hist_entry_iter;
@@ -186,7 +187,7 @@ static inline struct hists *evsel__hists(struct perf_evsel *evsel) 
}



int hists__init(void);

int __hists__init(struct hists *hists);

int __hists__init(struct hists *hists, struct perf_hpp_list *hpp_list);



struct rb_root *hists__get_rotate_entries_in(struct hists *hists);

bool hists__collapse_insert_entry(struct hists *hists __maybe_unused,