Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2146afc6 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Rename parse_events__free_terms() to parse_events_terms__delete() 

To follow convention used in other tools/perf/ areas. Also remove the
need to check if it is NULL before calling the destructor, again, to
follow convention that goes back to free().

Cc: Alexei Starovoitov <ast@kernel.org>
Cc: He Kuang <hekuang@huawei.com>
cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/n/tip-w6owu7rb8a46gvunlinxaqwx@git.kernel.org


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

tools/perf/arch/x86/util/intel-pt.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -89,7 +89,7 @@ static int intel_pt_parse_terms_with_default(struct list_head *formats, 




	*config = attr.config;

	*config = attr.config;

out_free:

out_free:

	parse_events__free_terms(terms);

	parse_events_terms__delete(terms);

	return err;

	return err;

}

}

tools/perf/util/parse-events.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -1386,8 +1386,7 @@ int parse_events_terms(struct list_head *terms, const char *str) 
		return 0;

		return 0;

	}

	}





	if (data.terms)

	parse_events_terms__delete(data.terms);

		parse_events__free_terms(data.terms);

	return ret;

	return ret;

}

}
@@ -2078,8 +2077,10 @@ void parse_events_terms__purge(struct list_head *terms) 
	}

	}

}

}





void parse_events__free_terms(struct list_head *terms)

void parse_events_terms__delete(struct list_head *terms)

{

{

	if (!terms)

		return;

	parse_events_terms__purge(terms);

	parse_events_terms__purge(terms);

	free(terms);

	free(terms);

}

}

tools/perf/util/parse-events.h

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

			      char *config, unsigned idx);

int parse_events_term__clone(struct parse_events_term **new,

int parse_events_term__clone(struct parse_events_term **new,

			     struct parse_events_term *term);

			     struct parse_events_term *term);

void parse_events__free_terms(struct list_head *terms);

void parse_events_terms__delete(struct list_head *terms);

void parse_events_terms__purge(struct list_head *terms);

void parse_events_terms__purge(struct list_head *terms);

int parse_events__modifier_event(struct list_head *list, char *str, bool add);

int parse_events__modifier_event(struct list_head *list, char *str, bool add);

int parse_events__modifier_group(struct list_head *list, char *event_mod);

int parse_events__modifier_group(struct list_head *list, char *event_mod);

tools/perf/util/parse-events.y

+4 −4
Original line number Original line Diff line number Diff line
@@ -218,7 +218,7 @@ PE_NAME '/' event_config '/' 




	ALLOC_LIST(list);

	ALLOC_LIST(list);

	ABORT_ON(parse_events_add_pmu(data, list, $1, $3));

	ABORT_ON(parse_events_add_pmu(data, list, $1, $3));

	parse_events__free_terms($3);

	parse_events_terms__delete($3);

	$$ = list;

	$$ = list;

}

}

|

|
@@ -246,7 +246,7 @@ PE_KERNEL_PMU_EVENT sep_dc 




	ALLOC_LIST(list);

	ALLOC_LIST(list);

	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));

	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));

	parse_events__free_terms(head);

	parse_events_terms__delete(head);

	$$ = list;

	$$ = list;

}

}

|

|
@@ -266,7 +266,7 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc 




	ALLOC_LIST(list);

	ALLOC_LIST(list);

	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));

	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));

	parse_events__free_terms(head);

	parse_events_terms__delete(head);

	$$ = list;

	$$ = list;

}

}
@@ -285,7 +285,7 @@ value_sym '/' event_config '/' 




	ALLOC_LIST(list);

	ALLOC_LIST(list);

	ABORT_ON(parse_events_add_numeric(data, list, type, config, $3));

	ABORT_ON(parse_events_add_numeric(data, list, type, config, $3));

	parse_events__free_terms($3);

	parse_events_terms__delete($3);

	$$ = list;

	$$ = list;

}

}

|

|