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=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 262C0C5DF63 for ; Wed, 6 Nov 2019 14:24:37 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DDEBE2173E for ; Wed, 6 Nov 2019 14:24:36 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IfEnYBmr" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731921AbfKFOYf (ORCPT ); Wed, 6 Nov 2019 09:24:35 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:20470 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727825AbfKFOYf (ORCPT ); Wed, 6 Nov 2019 09:24:35 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1573050273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=2vQG6Eler41ffZXEqOq6i7VFXxaSF0Gaziph9yLSU/4=; b=IfEnYBmr5cpdgVIABjvvfZNwwakprV6vHB0XbFtEHOsccaJMURGS445YGPqwKK9uKh7RS/ nuLUXLjVG4NYCSYtto7sjmjTA9waTvU2Hm5XlOLwPgWkMZYI8iDOf/LB+tBbGxJzUO+qCI alHMQeMUXuMCXQSIqRD11HVQyoA/CrM= 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-50-z9fAWbnJOnqhnrZPRk5xTQ-1; Wed, 06 Nov 2019 09:24:31 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0CFFB1800D53; Wed, 6 Nov 2019 14:24:29 +0000 (UTC) Received: from krava (unknown [10.43.17.48]) by smtp.corp.redhat.com (Postfix) with SMTP id B4B1D600C4; Wed, 6 Nov 2019 14:24:24 +0000 (UTC) Date: Wed, 6 Nov 2019 15:24:24 +0100 From: Jiri Olsa To: Ian Rogers Cc: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Namhyung Kim , Alexei Starovoitov , Daniel Borkmann , Martin KaFai Lau , Song Liu , Yonghong Song , Andi Kleen , Jin Yao , Adrian Hunter , Kan Liang , John Garry , linux-kernel@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, clang-built-linux@googlegroups.com, Stephane Eranian Subject: Re: [PATCH v5 06/10] perf tools: add destructors for parse event terms Message-ID: <20191106142424.GG30214@krava> References: <20191025180827.191916-1-irogers@google.com> <20191030223448.12930-1-irogers@google.com> <20191030223448.12930-7-irogers@google.com> MIME-Version: 1.0 In-Reply-To: <20191030223448.12930-7-irogers@google.com> User-Agent: Mutt/1.12.1 (2019-06-15) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-MC-Unique: z9fAWbnJOnqhnrZPRk5xTQ-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Oct 30, 2019 at 03:34:44PM -0700, Ian Rogers wrote: > If parsing fails then destructors are ran to clean the up the stack. > Rename the head union member to make the term and evlist use cases more > distinct, this simplifies matching the correct destructor. >=20 > Signed-off-by: Ian Rogers Acked-by: Jiri Olsa thanks, jirka > --- > tools/perf/util/parse-events.y | 69 +++++++++++++++++++++++----------- > 1 file changed, 48 insertions(+), 21 deletions(-) >=20 > diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-event= s.y > index 545ab7cefc20..035edfa8d42e 100644 > --- a/tools/perf/util/parse-events.y > +++ b/tools/perf/util/parse-events.y > @@ -12,6 +12,7 @@ > #include > #include > #include > +#include > #include "pmu.h" > #include "evsel.h" > #include "parse-events.h" > @@ -37,6 +38,25 @@ static struct list_head* alloc_list() > =09return list; > } > =20 > +static void free_list_evsel(struct list_head* list_evsel) > +{ > +=09struct evsel *evsel, *tmp; > + > +=09list_for_each_entry_safe(evsel, tmp, list_evsel, core.node) { > +=09=09list_del_init(&evsel->core.node); > +=09=09perf_evsel__delete(evsel); > +=09} > +=09free(list_evsel); > +} > + > +static void free_term(struct parse_events_term *term) > +{ > +=09if (term->type_val =3D=3D PARSE_EVENTS__TERM_TYPE_STR) > +=09=09free(term->val.str); > +=09zfree(&term->array.ranges); > +=09free(term); > +} > + > static void inc_group_count(struct list_head *list, > =09=09 struct parse_events_state *parse_state) > { > @@ -66,6 +86,7 @@ static void inc_group_count(struct list_head *list, > %type PE_VALUE_SYM_TOOL > %type PE_RAW > %type PE_TERM > +%type value_sym > %type PE_NAME > %type PE_BPF_OBJECT > %type PE_BPF_SOURCE > @@ -76,37 +97,43 @@ static void inc_group_count(struct list_head *list, > %type PE_EVENT_NAME > %type PE_PMU_EVENT_PRE PE_PMU_EVENT_SUF PE_KERNEL_PMU_EVENT > %type PE_DRV_CFG_TERM > -%type value_sym > -%type event_config > -%type opt_event_config > -%type opt_pmu_config > +%destructor { free ($$); } > %type event_term > -%type event_pmu > -%type event_legacy_symbol > -%type event_legacy_cache > -%type event_legacy_mem > -%type event_legacy_tracepoint > +%destructor { free_term ($$); } > +%type event_config > +%type opt_event_config > +%type opt_pmu_config > +%destructor { parse_events_terms__delete ($$); } > +%type event_pmu > +%type event_legacy_symbol > +%type event_legacy_cache > +%type event_legacy_mem > +%type event_legacy_tracepoint > +%type event_legacy_numeric > +%type event_legacy_raw > +%type event_bpf_file > +%type event_def > +%type event_mod > +%type event_name > +%type event > +%type events > +%type group_def > +%type group > +%type groups > +%destructor { free_list_evsel ($$); } > %type tracepoint_name > -%type event_legacy_numeric > -%type event_legacy_raw > -%type event_bpf_file > -%type event_def > -%type event_mod > -%type event_name > -%type event > -%type events > -%type group_def > -%type group > -%type groups > +%destructor { free ($$.sys); free ($$.event); } > %type array > %type array_term > %type array_terms > +%destructor { free ($$.ranges); } > =20 > %union > { > =09char *str; > =09u64 num; > -=09struct list_head *head; > +=09struct list_head *list_evsel; > +=09struct list_head *list_terms; > =09struct parse_events_term *term; > =09struct tracepoint_name { > =09=09char *sys; > --=20 > 2.24.0.rc1.363.gb1bccd3e3d-goog >=20