From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E571FC43143 for ; Tue, 2 Oct 2018 15:41:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A73A420652 for ; Tue, 2 Oct 2018 15:41:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A73A420652 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727403AbeJBWZc (ORCPT ); Tue, 2 Oct 2018 18:25:32 -0400 Received: from mx1.redhat.com ([209.132.183.28]:40498 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726835AbeJBWZc (ORCPT ); Tue, 2 Oct 2018 18:25:32 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 50512308124A; Tue, 2 Oct 2018 15:41:33 +0000 (UTC) Received: from krava (unknown [10.43.17.97]) by smtp.corp.redhat.com (Postfix) with SMTP id 140155D6A6; Tue, 2 Oct 2018 15:41:31 +0000 (UTC) Date: Tue, 2 Oct 2018 17:41:31 +0200 From: Jiri Olsa To: Andi Kleen Cc: acme@kernel.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, Andi Kleen Subject: Re: [PATCH v1 1/2] perf, tools: Move perf_evsel__reset_weak_group into evlist Message-ID: <20181002154128.GC6357@krava> References: <20181001195927.14211-1-andi@firstfloor.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20181001195927.14211-1-andi@firstfloor.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.49]); Tue, 02 Oct 2018 15:41:33 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Oct 01, 2018 at 12:59:26PM -0700, Andi Kleen wrote: > From: Andi Kleen > > - Move the function from builtin-stat to evlist for reuse > - Rename to evlist to match purpose better > - Pass the evlist as first argument. > - No functional changes > > Signed-off-by: Andi Kleen Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/builtin-stat.c | 29 ++--------------------------- > tools/perf/util/evlist.c | 27 +++++++++++++++++++++++++++ > tools/perf/util/evlist.h | 3 +++ > 3 files changed, 32 insertions(+), 27 deletions(-) > > diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c > index 08a1e64078ca..e60f6991dbb8 100644 > --- a/tools/perf/builtin-stat.c > +++ b/tools/perf/builtin-stat.c > @@ -567,32 +567,6 @@ static bool perf_evsel__should_store_id(struct perf_evsel *counter) > return STAT_RECORD || counter->attr.read_format & PERF_FORMAT_ID; > } > > -static struct perf_evsel *perf_evsel__reset_weak_group(struct perf_evsel *evsel) > -{ > - struct perf_evsel *c2, *leader; > - bool is_open = true; > - > - leader = evsel->leader; > - pr_debug("Weak group for %s/%d failed\n", > - leader->name, leader->nr_members); > - > - /* > - * for_each_group_member doesn't work here because it doesn't > - * include the first entry. > - */ > - evlist__for_each_entry(evsel_list, c2) { > - if (c2 == evsel) > - is_open = false; > - if (c2->leader == leader) { > - if (is_open) > - perf_evsel__close(c2); > - c2->leader = c2; > - c2->nr_members = 0; > - } > - } > - return leader; > -} > - > static int __run_perf_stat(int argc, const char **argv, int run_idx) > { > int interval = stat_config.interval; > @@ -639,7 +613,8 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) > if ((errno == EINVAL || errno == EBADF) && > counter->leader != counter && > counter->weak_group) { > - counter = perf_evsel__reset_weak_group(counter); > + counter = perf_evlist__reset_weak_group(evsel_list, > + counter); > goto try_again; > } > > diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c > index e7a4b31a84fb..de90f9097e97 100644 > --- a/tools/perf/util/evlist.c > +++ b/tools/perf/util/evlist.c > @@ -1810,3 +1810,30 @@ void perf_evlist__force_leader(struct perf_evlist *evlist) > leader->forced_leader = true; > } > } > + > +struct perf_evsel *perf_evlist__reset_weak_group(struct perf_evlist *evsel_list, > + struct perf_evsel *evsel) > +{ > + struct perf_evsel *c2, *leader; > + bool is_open = true; > + > + leader = evsel->leader; > + pr_debug("Weak group for %s/%d failed\n", > + leader->name, leader->nr_members); > + > + /* > + * for_each_group_member doesn't work here because it doesn't > + * include the first entry. > + */ > + evlist__for_each_entry(evsel_list, c2) { > + if (c2 == evsel) > + is_open = false; > + if (c2->leader == leader) { > + if (is_open) > + perf_evsel__close(c2); > + c2->leader = c2; > + c2->nr_members = 0; > + } > + } > + return leader; > +} > diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h > index dc66436add98..9919eed6d15b 100644 > --- a/tools/perf/util/evlist.h > +++ b/tools/perf/util/evlist.h > @@ -312,4 +312,7 @@ bool perf_evlist__exclude_kernel(struct perf_evlist *evlist); > > void perf_evlist__force_leader(struct perf_evlist *evlist); > > +struct perf_evsel *perf_evlist__reset_weak_group(struct perf_evlist *evlist, > + struct perf_evsel *evsel); > + > #endif /* __PERF_EVLIST_H */ > -- > 2.17.1 >