* [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c
@ 2017-04-24 4:26 Tony Jones
2017-04-24 4:26 ` [PATCH 2/2] perf tools: Add NULL end elements to 'unit_to_pmu' map Tony Jones
2017-04-24 13:05 ` [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Andi Kleen
0 siblings, 2 replies; 4+ messages in thread
From: Tony Jones @ 2017-04-24 4:26 UTC (permalink / raw)
To: mingo; +Cc: Tony Jones, Andi Kleen, linux-kernel
Guard _GNU_SOURCE (as done in pt-decoder/intel-pt-decoder.c) to prevent
possible redefinition error.
Signed-off-by: Tony Jones <tonyj@suse.de>
---
tools/perf/pmu-events/jevents.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index baa073f38334..b6300e875b87 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -1,5 +1,7 @@
#define _XOPEN_SOURCE 500 /* needed for nftw() */
+#ifndef _GNU_SOURCE
#define _GNU_SOURCE /* needed for asprintf() */
+#endif
/* Parse event JSON files */
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] perf tools: Add NULL end elements to 'unit_to_pmu' map
2017-04-24 4:26 [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Tony Jones
@ 2017-04-24 4:26 ` Tony Jones
2017-04-24 13:05 ` [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Andi Kleen
1 sibling, 0 replies; 4+ messages in thread
From: Tony Jones @ 2017-04-24 4:26 UTC (permalink / raw)
To: mingo; +Cc: Tony Jones, Andi Kleen, linux-kernel
Add NULL end elements to 'unit_to_pmu' map to prevent compiler warning on
some toolchains.
Signed-off-by: Tony Jones <tonyj@suse.de>
---
tools/perf/pmu-events/jevents.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index b6300e875b87..ecabdbb92944 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -198,7 +198,7 @@ static struct map {
{ "QPI LL", "uncore_qpi" },
{ "SBO", "uncore_sbox" },
{ "iMPH-U", "uncore_arb" },
- {}
+ { NULL, NULL}
};
static const char *field_to_perf(struct map *table, char *map, jsmntok_t *val)
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c
2017-04-24 4:26 [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Tony Jones
2017-04-24 4:26 ` [PATCH 2/2] perf tools: Add NULL end elements to 'unit_to_pmu' map Tony Jones
@ 2017-04-24 13:05 ` Andi Kleen
2017-04-24 15:45 ` Tony Jones
1 sibling, 1 reply; 4+ messages in thread
From: Andi Kleen @ 2017-04-24 13:05 UTC (permalink / raw)
To: Tony Jones; +Cc: mingo, linux-kernel
On Sun, Apr 23, 2017 at 09:26:32PM -0700, Tony Jones wrote:
> Guard _GNU_SOURCE (as done in pt-decoder/intel-pt-decoder.c) to prevent
> possible redefinition error.
Who defines it?
If it's always defined somewhere else it can be just removed.
-Andi
>
> Signed-off-by: Tony Jones <tonyj@suse.de>
> ---
> tools/perf/pmu-events/jevents.c | 2 ++
> 1 file changed, 2 insertions(+)
>
> diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
> index baa073f38334..b6300e875b87 100644
> --- a/tools/perf/pmu-events/jevents.c
> +++ b/tools/perf/pmu-events/jevents.c
> @@ -1,5 +1,7 @@
> #define _XOPEN_SOURCE 500 /* needed for nftw() */
> +#ifndef _GNU_SOURCE
> #define _GNU_SOURCE /* needed for asprintf() */
> +#endif
>
> /* Parse event JSON files */
>
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c
2017-04-24 13:05 ` [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Andi Kleen
@ 2017-04-24 15:45 ` Tony Jones
0 siblings, 0 replies; 4+ messages in thread
From: Tony Jones @ 2017-04-24 15:45 UTC (permalink / raw)
To: Andi Kleen; +Cc: mingo, linux-kernel
On 04/24/2017 06:05 AM, Andi Kleen wrote:
> On Sun, Apr 23, 2017 at 09:26:32PM -0700, Tony Jones wrote:
>> Guard _GNU_SOURCE (as done in pt-decoder/intel-pt-decoder.c) to prevent
>> possible redefinition error.
>
> Who defines it?
>
> If it's always defined somewhere else it can be just removed.
>
> -Andi
sometimes it's defaulted on (I believe) by the toolchain. it fails on our SLE12-SP3 toolchain.
I assumed the existing guard in pt-decoder/intel-pt-decoder.c (only other use) was for a reason.
tony
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-04-24 15:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-04-24 4:26 [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Tony Jones
2017-04-24 4:26 ` [PATCH 2/2] perf tools: Add NULL end elements to 'unit_to_pmu' map Tony Jones
2017-04-24 13:05 ` [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Andi Kleen
2017-04-24 15:45 ` Tony Jones
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).