Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1629159 > unrolled thread
| Started by | Tony Jones <tonyj@suse.de> |
|---|---|
| First post | 2017-04-24 06:30 +0200 |
| Last post | 2017-04-24 17:50 +0200 |
| Articles | 4 — 2 participants |
Back to article view | Back to linux.kernel
[PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Tony Jones <tonyj@suse.de> - 2017-04-24 06:30 +0200
[PATCH 2/2] perf tools: Add NULL end elements to 'unit_to_pmu' map Tony Jones <tonyj@suse.de> - 2017-04-24 06:30 +0200
Re: [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Andi Kleen <ak@linux.intel.com> - 2017-04-24 15:10 +0200
Re: [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c Tony Jones <tonyj@suse.de> - 2017-04-24 17:50 +0200
| From | Tony Jones <tonyj@suse.de> |
|---|---|
| Date | 2017-04-24 06:30 +0200 |
| Subject | [PATCH 1/2] perf tools: Guard _GNU_SOURCE in pmu-events/jevents.c |
| Message-ID | <tzDNo-21u-3@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Tony Jones <tonyj@suse.de> |
|---|---|
| Date | 2017-04-24 06:30 +0200 |
| Subject | [PATCH 2/2] perf tools: Add NULL end elements to 'unit_to_pmu' map |
| Message-ID | <tzDNo-21u-5@gated-at.bofh.it> |
| In reply to | #1629159 |
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
[toc] | [prev] | [next] | [standalone]
| From | Andi Kleen <ak@linux.intel.com> |
|---|---|
| Date | 2017-04-24 15:10 +0200 |
| Message-ID | <tzLUC-7pd-7@gated-at.bofh.it> |
| In reply to | #1629159 |
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 >
[toc] | [prev] | [next] | [standalone]
| From | Tony Jones <tonyj@suse.de> |
|---|---|
| Date | 2017-04-24 17:50 +0200 |
| Message-ID | <tzOpr-mK-3@gated-at.bofh.it> |
| In reply to | #1629520 |
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
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web