diff options
| author | Jiri Olsa <jolsa@kernel.org> | 2016-01-18 04:24:22 -0500 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-02-03 10:24:18 -0500 |
| commit | 5b65855e20348a9e2772a1cb7c1e6ab477859ba6 (patch) | |
| tree | 94c2e74d8ceb5282b7f2cdde46f7f418f0b2956d /tools/perf | |
| parent | 43e0a68f13047750a3728c983a539c61fb4121c5 (diff) | |
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: Jiri 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: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/util/hist.c | 5 | ||||
| -rw-r--r-- | tools/perf/util/hist.h | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index dea475d1fab0..2b9cc9129692 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c | |||
| @@ -1578,7 +1578,7 @@ int perf_hist_config(const char *var, const char *value) | |||
| 1578 | return 0; | 1578 | return 0; |
| 1579 | } | 1579 | } |
| 1580 | 1580 | ||
| 1581 | int __hists__init(struct hists *hists) | 1581 | int __hists__init(struct hists *hists, struct perf_hpp_list *hpp_list) |
| 1582 | { | 1582 | { |
| 1583 | memset(hists, 0, sizeof(*hists)); | 1583 | memset(hists, 0, sizeof(*hists)); |
| 1584 | hists->entries_in_array[0] = hists->entries_in_array[1] = RB_ROOT; | 1584 | hists->entries_in_array[0] = hists->entries_in_array[1] = RB_ROOT; |
| @@ -1587,6 +1587,7 @@ int __hists__init(struct hists *hists) | |||
| 1587 | hists->entries = RB_ROOT; | 1587 | hists->entries = RB_ROOT; |
| 1588 | pthread_mutex_init(&hists->lock, NULL); | 1588 | pthread_mutex_init(&hists->lock, NULL); |
| 1589 | hists->socket_filter = -1; | 1589 | hists->socket_filter = -1; |
| 1590 | hists->hpp_list = hpp_list; | ||
| 1590 | return 0; | 1591 | return 0; |
| 1591 | } | 1592 | } |
| 1592 | 1593 | ||
| @@ -1623,7 +1624,7 @@ static int hists_evsel__init(struct perf_evsel *evsel) | |||
| 1623 | { | 1624 | { |
| 1624 | struct hists *hists = evsel__hists(evsel); | 1625 | struct hists *hists = evsel__hists(evsel); |
| 1625 | 1626 | ||
| 1626 | __hists__init(hists); | 1627 | __hists__init(hists, &perf_hpp_list); |
| 1627 | return 0; | 1628 | return 0; |
| 1628 | } | 1629 | } |
| 1629 | 1630 | ||
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index a39c9c1159ff..b296ff5b9683 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h | |||
| @@ -75,6 +75,7 @@ struct hists { | |||
| 75 | u64 event_stream; | 75 | u64 event_stream; |
| 76 | u16 col_len[HISTC_NR_COLS]; | 76 | u16 col_len[HISTC_NR_COLS]; |
| 77 | int socket_filter; | 77 | int socket_filter; |
| 78 | struct perf_hpp_list *hpp_list; | ||
| 78 | }; | 79 | }; |
| 79 | 80 | ||
| 80 | struct hist_entry_iter; | 81 | struct hist_entry_iter; |
| @@ -186,7 +187,7 @@ static inline struct hists *evsel__hists(struct perf_evsel *evsel) | |||
| 186 | } | 187 | } |
| 187 | 188 | ||
| 188 | int hists__init(void); | 189 | int hists__init(void); |
| 189 | int __hists__init(struct hists *hists); | 190 | int __hists__init(struct hists *hists, struct perf_hpp_list *hpp_list); |
| 190 | 191 | ||
| 191 | struct rb_root *hists__get_rotate_entries_in(struct hists *hists); | 192 | struct rb_root *hists__get_rotate_entries_in(struct hists *hists); |
| 192 | bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, | 193 | bool hists__collapse_insert_entry(struct hists *hists __maybe_unused, |
