Received: by 2002:a25:ca44:0:0:0:0:0 with SMTP id a65csp968963ybg; Wed, 29 Jul 2020 02:23:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwaCnlUnwftu+KGxiKAXEzhi01vCn2DEe8/0vi5CO0g8QWAsWTfYENRUvlW4+BjbTD/lELL X-Received: by 2002:a17:906:3655:: with SMTP id r21mr4329197ejb.248.1596014588612; Wed, 29 Jul 2020 02:23:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1596014588; cv=none; d=google.com; s=arc-20160816; b=tgSX0FWP8OeiCsiGQO3VBhOiXWJUvKtPPgz+EVVLK6R+R7QjeRj+UFNq4GtVwfIuoI X9OkQj8stN3sua4DeflGMmXYvlmn1jugZ8TDPqkAupsBHWVK9Maue+3Is1Pgjy7wTOUL S8RSrFL59a+n8RnnAHY3999dV9Uz3i8w8vaDeTBC6ZZZGtkycBHat/LHUSqr2IC1fUAI zaH16OeWz4Mn3bIQYoJt1to1F0F0TT5NyHO9KnJSdPcFvEHGcKa3rPeD1MgvdmBcgRQv JVY3D9TuIe03d8+Rws4/c5oIY+qtrkS0lYqJoSdlZLXe0h4zBk0LPsSsYofO1rHEUih+ 9HqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=C05ilARMBwWPih0EtISAtr/pqrLSuFB5j2b5DNrT4RA=; b=t3lGYOICCxlbdE8O/KUdQb+JOtcDsdrKWSoI3/9RA4ngXibz/MRUJ09gI3D9aXV2Mv cMY6rHmlyPA5N2YAC6o8X6jtfEUXyJY4E2UXGz9lMITQwy7e6uVghhonUB3tPC6AZIQU yY+/4lQrjeRgcojPYw80dh4bv8cQcZ9FZYG1AMzeH1yE5E9bHeh6v9nZyJYVGA/bQcJd bA0kTkp2D2w6w6PGc8d2oGDHCh6MgLWL1GkJmd6zjsU3jepEhmByJeINVN9TBU+xV0GO hzgOtlpgrWQ1t/ZyNhPY2IXGvJ4E3WqT4YcSNUerNgOaOXyMjseL6zp8h5cFI2Q4L2f4 pXoA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id l12si725168ejq.20.2020.07.29.02.22.46; Wed, 29 Jul 2020 02:23:08 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728292AbgG2JUK convert rfc822-to-8bit (ORCPT + 99 others); Wed, 29 Jul 2020 05:20:10 -0400 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:38165 "EHLO us-smtp-delivery-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1728195AbgG2JUJ (ORCPT ); Wed, 29 Jul 2020 05:20:09 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-171-8BytmW01OcWCfHyTO70nbQ-1; Wed, 29 Jul 2020 05:20:02 -0400 X-MC-Unique: 8BytmW01OcWCfHyTO70nbQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 02DBF10059A8; Wed, 29 Jul 2020 09:20:00 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.193.247]) by smtp.corp.redhat.com (Postfix) with ESMTP id 804E66931E; Wed, 29 Jul 2020 09:19:56 +0000 (UTC) From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: Kajol Jain , Ian Rogers , Alexander Shishkin , Andi Kleen , John Garry , Michael Petlan , Namhyung Kim , Paul Clarke , Peter Zijlstra , Stephane Eranian , lkml , Ingo Molnar , Peter Zijlstra Subject: [PATCH 12/19] perf metric: Add events for the current list Date: Wed, 29 Jul 2020 11:19:01 +0200 Message-Id: <20200729091908.1378911-13-jolsa@kernel.org> In-Reply-To: <20200729091908.1378911-1-jolsa@kernel.org> References: <20200729091908.1378911-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org There's no need to iterate the whole list of groups, when adding new events. The currently created groups are the ones we want to add. Signed-off-by: Jiri Olsa Reviewed-by: Kajol Jain Acked-by: Ian Rogers Cc: Alexander Shishkin Cc: Andi Kleen Cc: John Garry Cc: Michael Petlan Cc: Namhyung Kim Cc: Paul Clarke Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lore.kernel.org/lkml/20200719181320.785305-13-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/metricgroup.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c index a9f101948e1f..caec3696e52b 100644 --- a/tools/perf/util/metricgroup.c +++ b/tools/perf/util/metricgroup.c @@ -813,6 +813,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group, { struct pmu_event *pe; struct egroup *eg; + LIST_HEAD(list); int i, ret; bool has_match = false; @@ -820,7 +821,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group, has_match = true; eg = NULL; - ret = add_metric(group_list, pe, metric_no_group, &eg); + ret = add_metric(&list, pe, metric_no_group, &eg); if (ret) return ret; @@ -829,7 +830,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group, * included in the expression. */ ret = resolve_metric(eg, metric_no_group, - group_list, map); + &list, map); if (ret) return ret; } @@ -838,7 +839,7 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group, if (!has_match) return -EINVAL; - list_for_each_entry(eg, group_list, nd) { + list_for_each_entry(eg, &list, nd) { if (events->len > 0) strbuf_addf(events, ","); @@ -850,6 +851,8 @@ static int metricgroup__add_metric(const char *metric, bool metric_no_group, &eg->pctx); } } + + list_splice(&list, group_list); return 0; } -- 2.25.4