Re: [PATCH v6 4/7] perf util: Link stream pair

Arnaldo Carvalho de Melo
2020-09-17T20:24:00Z

Em Fri, Sep 11, 2020 at 04:03:50PM +0800, Jin Yao escreveu:
> In previous patch, we have created an evsel_streams for one event,
> and top N hottest streams will be saved in a stream array in
> evsel_streams.
>
> This patch compares total streams among two evsel_streams.
>
> Once two streams are fully matched, they will be linked as
> a pair. From the pair, we can know which streams are matched.
>
> Signed-off-by: Jin Yao <yao.jin@linux.intel.com>
> ---
> v6:
> - Rebase to perf/core
>
> v5:
> - Remove enum stream_type
>
> v4:
> - New patch in v4.
>
> tools/perf/util/stream.c | 40 ++++++++++++++++++++++++++++++++++++++++
> tools/perf/util/stream.h | 4 ++++
> 2 files changed, 44 insertions(+)
>
> diff --git a/tools/perf/util/stream.c b/tools/perf/util/stream.c
> index 7882a7f05d97..e96e21d6e07b 100644
> --- a/tools/perf/util/stream.c
> +++ b/tools/perf/util/stream.c
> @@ -157,3 +157,43 @@ struct evsel_streams *evsel_streams_get(struct evsel_streams *es,
>
> return NULL;
> }
> +
> +static struct stream *stream_callchain_match(struct stream *base_stream,
> + struct evsel_streams *es_pair)

Please use stream__

> +{
> + for (int i = 0; i < es_pair->nr_streams; i++) {
> + struct stream *pair_stream = &es_pair->streams[i];
> +
> + if (callchain_cnode_matched(base_stream->cnode,
> + pair_stream->cnode)) {
> + return pair_stream;
> + }
> + }
> +
> + return NULL;
> +}
> +
> +static struct stream *stream_match(struct stream *base_stream,
> + struct evsel_streams *es_pair)
> +{
> + return stream_callchain_match(base_stream, es_pair);
> +}
> +
> +static void stream_link(struct stream *base_stream, struct stream *pair_stream)
> +{
> + base_stream->pair_cnode = pair_stream->cnode;
> + pair_stream->pair_cnode = base_stream->cnode;
> +}
> +
> +void match_evsel_streams(struct evsel_streams *es_base,
> + struct evsel_streams *es_pair)
> +{
> + for (int i = 0; i < es_base->nr_streams; i++) {
> + struct stream *base_stream = &es_base->streams[i];
> + struct stream *pair_stream;
> +
> + pair_stream = stream_match(base_stream, es_pair);
> + if (pair_stream)
> + stream_link(base_stream, pair_stream);
> + }
> +}
> diff --git a/tools/perf/util/stream.h b/tools/perf/util/stream.h
> index 66f61d954eef..2eb6f17a834e 100644
> --- a/tools/perf/util/stream.h
> +++ b/tools/perf/util/stream.h
> @@ -6,6 +6,7 @@
>
> struct stream {
> struct callchain_node *cnode;
> + struct callchain_node *pair_cnode;
> };
>
> struct evsel_streams {
> @@ -23,4 +24,7 @@ struct evsel_streams *perf_evlist__create_streams(struct evlist *evlist,
> struct evsel_streams *evsel_streams_get(struct evsel_streams *es,
> int nr_evsel, int evsel_idx);
>
> +void match_evsel_streams(struct evsel_streams *es_base,
> + struct evsel_streams *es_pair);
> +
> #endif /* __PERF_STREAM_H */
> --
> 2.17.1
>

--

- Arnaldo