Commit 1dc92556 authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf parse: Add a deep delete for parse event terms 



Add a parse_events_term deep delete function so that owned strings and
arrays are freed.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Acked-by: default avatarJiri Olsa <jolsa@kernel.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexei Starovoitov <ast@kernel.org>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Daniel Borkmann <daniel@iogearbox.net>
Cc: Jin Yao <yao.jin@linux.intel.com>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Martin KaFai Lau <kafai@fb.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Song Liu <songliubraving@fb.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Yonghong Song <yhs@fb.com>
Cc: bpf@vger.kernel.org
Cc: clang-built-linux@googlegroups.com
Cc: netdev@vger.kernel.org
Link: http://lore.kernel.org/lkml/20191030223448.12930-10-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 38f2c422

tools/perf/util/parse-events.c

+13 −3
Original line number Diff line number Diff line
@@ -2812,6 +2812,18 @@ int parse_events_term__clone(struct parse_events_term **new, 
	return new_term(new, &temp, str, 0);

}



void parse_events_term__delete(struct parse_events_term *term)

{

	if (term->array.nr_ranges)

		zfree(&term->array.ranges);



	if (term->type_val != PARSE_EVENTS__TERM_TYPE_NUM)

		zfree(&term->val.str);



	zfree(&term->config);

	free(term);

}



int parse_events_copy_term_list(struct list_head *old,

				 struct list_head **new)

{
@@ -2842,10 +2854,8 @@ void parse_events_terms__purge(struct list_head *terms) 
	struct parse_events_term *term, *h;



	list_for_each_entry_safe(term, h, terms, list) {

		if (term->array.nr_ranges)

			zfree(&term->array.ranges);

		list_del_init(&term->list);

		free(term);

		parse_events_term__delete(term);

	}

}

tools/perf/util/parse-events.h

+1 −0
Original line number Diff line number Diff line
@@ -139,6 +139,7 @@ int parse_events_term__sym_hw(struct parse_events_term **term, 
			      char *config, unsigned idx);

int parse_events_term__clone(struct parse_events_term **new,

			     struct parse_events_term *term);

void parse_events_term__delete(struct parse_events_term *term);

void parse_events_terms__delete(struct list_head *terms);

void parse_events_terms__purge(struct list_head *terms);

void parse_events__clear_array(struct parse_events_array *a);

tools/perf/util/parse-events.y

+2 −10
Original line number Diff line number Diff line
@@ -49,14 +49,6 @@ static void free_list_evsel(struct list_head* list_evsel) 
	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)

{
@@ -99,7 +91,7 @@ static void inc_group_count(struct list_head *list, 
%type <str> PE_DRV_CFG_TERM

%destructor { free ($$); } <str>

%type <term> event_term

%destructor { free_term ($$); } <term>

%destructor { parse_events_term__delete ($$); } <term>

%type <list_terms> event_config

%type <list_terms> opt_event_config

%type <list_terms> opt_pmu_config
@@ -694,7 +686,7 @@ event_config ',' event_term 
	struct parse_events_term *term = $3;



	if (!head) {

		free_term(term);

		parse_events_term__delete(term);

		YYABORT;

	}

	list_add_tail(&term->list, head);

tools/perf/util/pmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1260,7 +1260,7 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms, 
		info->metric_name = alias->metric_name;



		list_del_init(&term->list);

		free(term);

		parse_events_term__delete(term);

	}



	/*

CRA Git | Maintained and supported by SUSTech CRA and CCSE