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=-17.4 required=3.0 tests=DKIMWL_WL_MED,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_GIT, USER_IN_DEF_DKIM_WL autolearn=unavailable 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 9E0F8CA9EBC for ; Thu, 24 Oct 2019 19:02:56 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 74551222C9 for ; Thu, 24 Oct 2019 19:02:56 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="CgSp5bXh" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2504387AbfJXTCx (ORCPT ); Thu, 24 Oct 2019 15:02:53 -0400 Received: from mail-pl1-f202.google.com ([209.85.214.202]:52053 "EHLO mail-pl1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2504304AbfJXTCY (ORCPT ); Thu, 24 Oct 2019 15:02:24 -0400 Received: by mail-pl1-f202.google.com with SMTP id q13so7324932plr.18 for ; Thu, 24 Oct 2019 12:02:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=5ErD/uUW7vtCV74qLmYJVVPg+bMOBGzP+X5HkC35T58=; b=CgSp5bXhlUTobiRM02zmWJl/O1es6j5hx616jElbXLxD1B/jx2Kr8Rtetuhpq0IELJ d6CyfMksRrCJHO9l8rwsrCQVTs5T/o5z0pSly17+SuoOFAKaR34TpAtw4uSAaTYm/NfE uE4UUFgHPw3V9+cSTUJJ6pn6Wh2WkdbnfNHVit9yo2tyY6FZELkiS+1f13s0E3cXnkk3 bYE0Pce24L/CUrFWL5M4tJtuuVEO7/DuF8T0K/0y0JUO5/fq5fVO26BK1gkBi1UqwlFm 7S3FyUeoj/LGDVT46VMlxoaYsT//fiNtfwVq7w6e/CtbzmIF04pCGq+U3yXoFtpXktab yEWg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=5ErD/uUW7vtCV74qLmYJVVPg+bMOBGzP+X5HkC35T58=; b=IPcMz0fAbwi+aMjyl+TaTkfVhtGorBwhP7g7Y9oDoG4N38dyu5p92Ihv2bPIHfpkMD JzmYffuLathulmwcWP7PptSsyjOaXJQFnGNKuO7pXqV/VxiONdd1hrdlFT/RhTLM7EvU yOYxWjxWJ5UxauqEcBlCA3WOy/8vWEsTWyQR1270wSPYq+wCeIRH9zqCErWdtvjVFSwq bMM1FqezxSBIELIoRFRCBTWSVy9149f6MZh/hEE6rt/szS5YS9UrNtZB78m8gpRYryvQ FYy7ZvRrRDN2qGHbV57bO5bYCe9Wn7X7pZrXF259kPtFrplXOWsHZXYQ2BFG7R0WBjZ+ 3Ozw== X-Gm-Message-State: APjAAAWpfrqtOY523Sf7AhZd66DzHXnqtBYvgmULFoiq6PAodps/l3Qo wSVpl7B53it7Wr8hMjLXnaOoz1x+FrZN X-Google-Smtp-Source: APXvYqyXwpQ3TOn2fiGdk7NbgwLDCWGp6oVYQFmvn282WUx13NemB5ayXRRZtlfNgRR6m60/vRmJgLC56SrG X-Received: by 2002:a63:8f41:: with SMTP id r1mr13088716pgn.83.1571943743102; Thu, 24 Oct 2019 12:02:23 -0700 (PDT) Date: Thu, 24 Oct 2019 12:01:59 -0700 In-Reply-To: <20191024190202.109403-1-irogers@google.com> Message-Id: <20191024190202.109403-7-irogers@google.com> Mime-Version: 1.0 References: <20191023005337.196160-1-irogers@google.com> <20191024190202.109403-1-irogers@google.com> X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog Subject: [PATCH v3 6/9] perf tools: add destructors for parse event terms From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Mark Rutland , Alexander Shishkin , Jiri Olsa , 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 Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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. Signed-off-by: Ian Rogers --- tools/perf/util/parse-events.y | 69 +++++++++++++++++++++++----------- 1 file changed, 48 insertions(+), 21 deletions(-) diff --git a/tools/perf/util/parse-events.y b/tools/perf/util/parse-events.y index 545ab7cefc20..4725b14b9db4 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() return list; } +static void free_list_evsel(struct list_head* list_evsel) +{ + struct perf_evsel *pos, *tmp; + + list_for_each_entry_safe(pos, tmp, list_evsel, node) { + list_del_init(&pos->node); + perf_evsel__delete(pos); + } + free(list_evsel); +} + +static void free_term(struct parse_events_term *term) +{ + if (term->type_val == PARSE_EVENTS__TERM_TYPE_STR) + free(term->val.str); + zfree(&term->array.ranges); + free(term); +} + static void inc_group_count(struct list_head *list, 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); } %union { char *str; u64 num; - struct list_head *head; + struct list_head *list_evsel; + struct list_head *list_terms; struct parse_events_term *term; struct tracepoint_name { char *sys; -- 2.23.0.866.gb869b98d4c-goog