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 CFDDDCA9EA0 for ; Wed, 23 Oct 2019 00:54:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A73582084B for ; Wed, 23 Oct 2019 00:54:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nz2uurdi" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733145AbfJWAyj (ORCPT ); Tue, 22 Oct 2019 20:54:39 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:53548 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1732951AbfJWAyP (ORCPT ); Tue, 22 Oct 2019 20:54:15 -0400 Received: by mail-pg1-f202.google.com with SMTP id r25so13800496pga.20 for ; Tue, 22 Oct 2019 17:54:15 -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=nz2uurdimjtldNTEoiMbb+rZ7G6+/McOYNx3KBrG80NV8yIYQCsVz+nZZ64wjXn/CD 194GMWoqLJKDaHgh348xPChUS2ZdNA8yfMtHFsaphbhOgU4pV1O8kRsA8vpsGMErkhoj 2xVkP5gGBwd1/Ze9WU/sHaXlFhfK655QyKXE5GeZv7YBQFoDJhksFk9YaNnvJH8vNTau 8PWgPHVPZaaaVCYDGnLqbQ975KiKdmnWlD/AxK8gcc/miyNAn/lwWmzNUR5qxxPIyAJN L+P3vDMqaUUbRxx+deiXD+SVNpXMcKFY1sEkEUD5GNbDae87brG+/icY+y7PWfCtslZ4 d66A== 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=RVkz37CbhFMZ3cHonwc2yWnrn/Cbn4oijxtsGKtDW76YsDQxEum04KiIwH1CEAQn4I QgIKo2blq3NV2H0foo2m8hF7UfC3WsQCSlOXtYZDrbykNbIKjxPOB5LGn27vyJmSj99t KnN9y2hKFR5Tq9anvEQcUhN98hV7Vj7Sti6NS1uhp1DSNI7Yz1Xa9OMz9RVS3Si4eVC2 +8a6l4s4LIrGpBuW0NyPkc/rYk5TrvMQuRK5n2nxyxvcU2hmFqrQP4lvGkovu6u0ouq6 1nQxwqxyE8mYKCfCR9//HO7iH69Naf2DApEHE3I05KNLE04l+60CTOKWgj9FpdhauE7Q IDzA== X-Gm-Message-State: APjAAAVbFSwK76uIY4f0j7LLAB+wIreEF6YeRLua2fH1FQwR/yxi8fG9 N1+kId87tuRLAAJKY/5vV+hM9rr2MFrA X-Google-Smtp-Source: APXvYqw68MRltqDbbSVJXBzvXcrD1zPG/SpAMuWzVbvPk288n4oOn7iZOhweSgAzWN/4RfD4Mm+Aurb8OQBb X-Received: by 2002:a63:7c14:: with SMTP id x20mr49380pgc.208.1571792054270; Tue, 22 Oct 2019 17:54:14 -0700 (PDT) Date: Tue, 22 Oct 2019 17:53:34 -0700 In-Reply-To: <20191023005337.196160-1-irogers@google.com> Message-Id: <20191023005337.196160-7-irogers@google.com> Mime-Version: 1.0 References: <20191017170531.171244-1-irogers@google.com> <20191023005337.196160-1-irogers@google.com> X-Mailer: git-send-email 2.23.0.866.gb869b98d4c-goog Subject: [PATCH v2 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: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@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