Commit 8f91662e authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf parse-events: Tidy up str parameter 



Add a const and rename str to event_name.

Reviewed-by: default avatarJames Clark <james.clark@arm.com>
Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rob Herring <robh@kernel.org>
Link: https://lore.kernel.org/r/20230901233949.2930562-3-irogers@google.com


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

tools/perf/util/parse-events.c

+7 −6
Original line number Diff line number Diff line
@@ -1482,7 +1482,7 @@ int parse_events_add_pmu(struct parse_events_state *parse_state, 
}



int parse_events_multi_pmu_add(struct parse_events_state *parse_state,

			       char *str, struct list_head *head,

			       const char *event_name, struct list_head *head,

			       struct list_head **listp, void *loc_)

{

	struct parse_events_term *term;
@@ -1502,7 +1502,8 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, 


		INIT_LIST_HEAD(head);

	}

	config = strdup(str);



	config = strdup(event_name);

	if (!config)

		goto out_err;
@@ -1528,7 +1529,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, 
		if (parse_events__filter_pmu(parse_state, pmu))

			continue;



		if (!perf_pmu__have_event(pmu, str))

		if (!perf_pmu__have_event(pmu, event_name))

			continue;



		auto_merge_stats = perf_pmu__auto_merge_stats(pmu);
@@ -1539,7 +1540,7 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, 


			strbuf_init(&sb, /*hint=*/ 0);

			parse_events_term__to_strbuf(orig_head, &sb);

			pr_debug("%s -> %s/%s/\n", str, pmu->name, sb.buf);

			pr_debug("%s -> %s/%s/\n", event_name, pmu->name, sb.buf);

			strbuf_release(&sb);

			ok++;

		}
@@ -1547,13 +1548,13 @@ int parse_events_multi_pmu_add(struct parse_events_state *parse_state, 
	}



	if (parse_state->fake_pmu) {

		if (!parse_events_add_pmu(parse_state, list, str, head,

		if (!parse_events_add_pmu(parse_state, list, event_name, head,

					  /*auto_merge_stats=*/true, loc)) {

			struct strbuf sb;



			strbuf_init(&sb, /*hint=*/ 0);

			parse_events_term__to_strbuf(head, &sb);

			pr_debug("%s -> %s/%s/\n", str, "fake_pmu", sb.buf);

			pr_debug("%s -> %s/%s/\n", event_name, "fake_pmu", sb.buf);

			strbuf_release(&sb);

			ok++;

		}

tools/perf/util/parse-events.h

+1 −1
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr, 
				      struct perf_pmu *pmu);



int parse_events_multi_pmu_add(struct parse_events_state *parse_state,

			       char *str,

			       const char *event_name,

			       struct list_head *head_config,

			       struct list_head **listp, void *loc);