perf tools: Rename parse_events__free_terms() to parse_events_terms__delete()

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Feb 16, 2016 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2016-02-16 07:55 UTC #0 lore raw

Commit-ID:  2146afc6b45b3f1b967f5605d4e6d97dd9e31061
Gitweb:     http://git.kernel.org/tip/2146afc6b45b3f1b967f5605d4e6d97dd9e31061
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Fri, 12 Feb 2016 17:09:17 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 12 Feb 2016 17:09:17 -0300

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 <[email protected]>

Cc He Kuang <[email protected]>

cc Jiri Olsa <[email protected]>

Cc Masami Hiramatsu <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Cc Zefan Li <[email protected]>

Cc [email protected]

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/arch/x86/util/intel-pt.c | 2 +-
 tools/perf/util/parse-events.c      | 7 ++++---
 tools/perf/util/parse-events.h      | 2 +-
 tools/perf/util/parse-events.y      | 8 ++++----
 4 files changed, 10 insertions(+), 9 deletions(-)

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

index 6f7d453..a339517 100644
@@ -89,7 +89,7 @@ static int intel_pt_parse_terms_with_default(struct list_head *formats,
 
 	*config = attr.config;
 out_free:
-	parse_events__free_terms(terms);
+	parse_events_terms__delete(terms);
 	return err;
 }

tools/perf/util/parse-events.c +4 -3

index d1b49ec..e5583fd 100644
@@ -1386,8 +1386,7 @@ int parse_events_terms(struct list_head *terms, const char *str)
 		return 0;
 	}
 
-	if (data.terms)
-		parse_events__free_terms(data.terms);
+	parse_events_terms__delete(data.terms);
 	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);
 	free(terms);
 }

tools/perf/util/parse-events.h +1 -1

index f90a04c..53628bf 100644
@@ -115,7 +115,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__free_terms(struct list_head *terms);
+void parse_events_terms__delete(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_group(struct list_head *list, char *event_mod);

tools/perf/util/parse-events.y +4 -4

index ad37996..c0eac88 100644
@@ -218,7 +218,7 @@ PE_NAME '/' event_config '/'
 
 	ALLOC_LIST(list);
 	ABORT_ON(parse_events_add_pmu(data, list, $1, $3));
-	parse_events__free_terms($3);
+	parse_events_terms__delete($3);
 	$$ = list;
 }
 |

@@ -246,7 +246,7 @@ PE_KERNEL_PMU_EVENT sep_dc
 
 	ALLOC_LIST(list);
 	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));
-	parse_events__free_terms(head);
+	parse_events_terms__delete(head);
 	$$ = list;
 }
 |

@@ -266,7 +266,7 @@ PE_PMU_EVENT_PRE '-' PE_PMU_EVENT_SUF sep_dc
 
 	ALLOC_LIST(list);
 	ABORT_ON(parse_events_add_pmu(data, list, "cpu", head));
-	parse_events__free_terms(head);
+	parse_events_terms__delete(head);
 	$$ = list;
 }

@@ -285,7 +285,7 @@ value_sym '/' event_config '/'
 
 	ALLOC_LIST(list);
 	ABORT_ON(parse_events_add_numeric(data, list, type, config, $3));
-	parse_events__free_terms($3);
+	parse_events_terms__delete($3);
 	$$ = list;
 }
 |