* [PATCH] perf parse-events: Avoid enum forward declaration.
@ 2021-09-15 21:14 Ian Rogers
2021-09-15 21:21 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 2+ messages in thread
From: Ian Rogers @ 2021-09-15 21:14 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
linux-perf-users, linux-kernel
Cc: Nathan Chancellor, Nick Desaulniers, Ian Rogers
Enum forward declarations aren't allowed as the size can't be implied.
Switch to just using an int. This fixes a clang warning:
In file included from tools/perf/bench/evlist-open-close.c:13:
tools/perf/bench/../util/parse-events.h:185:6: error: redeclaration of already-defined enum 'perf_tool_event' is a GNU extension [-Werror,-Wgnu-redeclared-enum]
enum perf_tool_event;
^
tools/perf/bench/../util/evsel.h:28:6: note: previous definition is here
enum perf_tool_event {
^
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/util/parse-events.c | 2 +-
tools/perf/util/parse-events.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index 51a2219df601..5d1346aa0627 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -1471,7 +1471,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
int parse_events_add_tool(struct parse_events_state *parse_state,
struct list_head *list,
- enum perf_tool_event tool_event)
+ int tool_event)
{
return add_event_tool(list, &parse_state->idx, tool_event);
}
diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index bf6e41aa9b6a..b32ed3064c49 100644
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -182,10 +182,9 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
struct list_head *list,
u32 type, u64 config,
struct list_head *head_config);
-enum perf_tool_event;
int parse_events_add_tool(struct parse_events_state *parse_state,
struct list_head *list,
- enum perf_tool_event tool_event);
+ int tool_event);
int parse_events_add_cache(struct list_head *list, int *idx,
char *type, char *op_result1, char *op_result2,
struct parse_events_error *error,
--
2.33.0.309.g3052b89438-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] perf parse-events: Avoid enum forward declaration.
2021-09-15 21:14 [PATCH] perf parse-events: Avoid enum forward declaration Ian Rogers
@ 2021-09-15 21:21 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-09-15 21:21 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, linux-perf-users, linux-kernel,
Nathan Chancellor, Nick Desaulniers
Em Wed, Sep 15, 2021 at 02:14:28PM -0700, Ian Rogers escreveu:
> Enum forward declarations aren't allowed as the size can't be implied.
> Switch to just using an int. This fixes a clang warning:
>
> In file included from tools/perf/bench/evlist-open-close.c:13:
> tools/perf/bench/../util/parse-events.h:185:6: error: redeclaration of already-defined enum 'perf_tool_event' is a GNU extension [-Werror,-Wgnu-redeclared-enum]
> enum perf_tool_event;
> ^
> tools/perf/bench/../util/evsel.h:28:6: note: previous definition is here
> enum perf_tool_event {
> ^
Thanks, applied.
- Arnaldo
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---
> tools/perf/util/parse-events.c | 2 +-
> tools/perf/util/parse-events.h | 3 +--
> 2 files changed, 2 insertions(+), 3 deletions(-)
>
> diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
> index 51a2219df601..5d1346aa0627 100644
> --- a/tools/perf/util/parse-events.c
> +++ b/tools/perf/util/parse-events.c
> @@ -1471,7 +1471,7 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
>
> int parse_events_add_tool(struct parse_events_state *parse_state,
> struct list_head *list,
> - enum perf_tool_event tool_event)
> + int tool_event)
> {
> return add_event_tool(list, &parse_state->idx, tool_event);
> }
> diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
> index bf6e41aa9b6a..b32ed3064c49 100644
> --- a/tools/perf/util/parse-events.h
> +++ b/tools/perf/util/parse-events.h
> @@ -182,10 +182,9 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
> struct list_head *list,
> u32 type, u64 config,
> struct list_head *head_config);
> -enum perf_tool_event;
> int parse_events_add_tool(struct parse_events_state *parse_state,
> struct list_head *list,
> - enum perf_tool_event tool_event);
> + int tool_event);
> int parse_events_add_cache(struct list_head *list, int *idx,
> char *type, char *op_result1, char *op_result2,
> struct parse_events_error *error,
> --
> 2.33.0.309.g3052b89438-goog
--
- Arnaldo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-09-15 21:21 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-09-15 21:14 [PATCH] perf parse-events: Avoid enum forward declaration Ian Rogers
2021-09-15 21:21 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.