Skip to contentSkip to conversation

Fixes for gcc 16.0.1

PATCH In review Arnaldo Carvalho de Melo 3 participants 13 messages Jan 20 – Jan 22 perf events

lore
Share & tools
lore

Arnaldo Carvalho de Melo

author maintainer
#0 lore raw

cover Fixes for gcc 16.0.1

From: Arnaldo Carvalho de Melo <[email protected]>

Hi,

A bunch of fixes for recent gcc versions,

- Arnaldo

Arnaldo Carvalho de Melo (4):
perf tests sw-clock: Mark the volatile tmp variable as __maybe_unused perf trace: Deal with compiler const checks
perf list: Don't write to const memory
perf list: Signal changing const memory is ok

 tools/perf/builtin-trace.c     |  2 +-
 tools/perf/tests/sw-clock.c    |  3 ++-
 tools/perf/util/print-events.c | 15 ++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)
Signature · 1 line
2.52.0
author maintainer
#1 lore raw

PATCH 1/4 perf tests sw-clock: Mark the volatile tmp variable as __maybe_unused

From: Arnaldo Carvalho de Melo <[email protected]>

As it is just used to waste some cycles, not being used as all, to silence some compilers.

Noticed with gcc version 16.0.1 20260115 on fedora 44:

tests/sw-clock.c: In function '__test__sw_clock_freq':
tests/sw-clock.c:31:22: error: variable 'tmp' set but not used [-Werror=unused-but-set-variable=]
31 | volatile int tmp = 0;
| ^~~

---
 tools/perf/tests/sw-clock.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
tools/perf/tests/sw-clock.c +2 -1
index 4a2ad7176fa07be0..b6e46975379cd5ef 100644
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/mman.h>
+#include <linux/compiler.h>
 #include <linux/string.h>
 
 #include "tests.h"
@@ -28,7 +29,7 @@
 static int __test__sw_clock_freq(enum perf_sw_ids clock_id)
 {
 	int i, err = -1;
-	volatile int tmp = 0;
+	volatile int tmp __maybe_unused = 0;
 	u64 total_periods = 0;
 	int nr_samples = 0;
 	char sbuf[STRERR_BUFSIZE];
Signature · 1 line
2.52.0
author maintainer
#2 lore raw

PATCH 2/4 perf trace: Deal with compiler const checks

In reply to Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <[email protected]>

The strchr() function these days return const/non-const based on the arg it receives, and sometimes we need to use casts when we're dealing with variables that are used in code that needs to safely change the returned value and sometimes not (as it points to really const areas).

Tweak one such case.

---
 tools/perf/builtin-trace.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/builtin-trace.c +1 -1
index 58a32adafddff7f5..8df5ca44e4f91529 100644
@@ -5190,7 +5190,7 @@ static int trace__parse_events_option(const struct option *opt, const char *str,
 	}
 
 	while (1) {
-		if ((sep = strchr(s, ',')) != NULL)
+		if ((sep = strchr((char *)s, ',')) != NULL)
 			*sep = '\0';
 
 		list = 0;
Signature · 1 line
2.52.0
author maintainer
#3 lore raw

PATCH 3/4 perf list: Don't write to const memory

In reply to Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +5 -8
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchr(next_sdt_name->s, '@');
+
+				show_detail = bid2 ?
+						strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+						strcmp(sdt_name->s, next_sdt_name->s) == 0;
 			}
 		}
 		last_sdt_name = sdt_name->s;
Signature · 1 line
2.52.0
author maintainer
#10 lore raw

PATCH 4/4 perf list: Signal changing const memory is ok

In reply to Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <[email protected]>

In this case its a temp list that is created just for listing events and will be deleted at the end, so just cast it to get rid of the compiler warning.

---
 tools/perf/util/print-events.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/print-events.c +1 -1
index 898cf426509790cd..57c06f6bca1fced6 100644
@@ -86,7 +86,7 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 
 	strlist__for_each_entry(sdt_name, sdtlist) {
 		bool show_detail = false;
-		char *bid = strchr(sdt_name->s, '@');
+		char *bid = (char *)strchr(sdt_name->s, '@');
 		char *evt_name = NULL;
 
 		if (bid)
Signature · 1 line
2.52.0
reviewer Reviewed-by on the v1 series
#11 lore raw
In reply to Arnaldo Carvalho de Melo
Quoted 8 lines · Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <[email protected]>

Hi,

A bunch of fixes for recent gcc versions,

- Arnaldo

These look like the least bad resolutions to the new warnings, thanks! Ian

Quoted 14 lines

Arnaldo Carvalho de Melo (4):
perf tests sw-clock: Mark the volatile tmp variable as __maybe_unused perf trace: Deal with compiler const checks
perf list: Don't write to const memory
perf list: Signal changing const memory is ok

 tools/perf/builtin-trace.c     |  2 +-
 tools/perf/tests/sw-clock.c    |  3 ++-
 tools/perf/util/print-events.c | 15 ++++++---------
 3 files changed, 9 insertions(+), 11 deletions(-)

--
2.52.0

author maintainer
#12 lore raw
Quoted 7 lines · Ian Rogers
Quoted 5 lines · Arnaldo Carvalho de Melo

From: Arnaldo Carvalho de Melo <[email protected]>

Hi,

Quoted 7 lines
Quoted 3 lines

A bunch of fixes for recent gcc versions,

- Arnaldo

These look like the least bad resolutions to the new warnings, thanks!

Thanks!

- Arnaldo

Quoted 1 line

Ian

#4 lore raw

Re: [PATCH 3/4] perf list: Don't write to const memory

In reply to Arnaldo Carvalho de Melo
Quoted 29 lines · On Tue, 20 Jan 2026 19:08:59 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +0 -3
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)

tools/perf/util/print-events.c void print_sdt_events(const struct print_callbacks *print_cb, void *print_state) · line 104

Quoted 10 lines
tools/perf/util/print-events.c +5 -5
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchr(next_sdt_name->s, '@');
+
+				show_detail = bid2 ?
+						strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+						strcmp(sdt_name->s, next_sdt_name->s) == 0;

You could use:

	show_detail = strncmp(sdt_name->s, next_sdt_name->s, strcspn(sdt_name->s, "@"));

strcspn() will be slower, but it is succinct.
I'm sure there is a function like strchr() that returns a pointer to the '\0' when the character isn't found - but I can't remember what it is called :-(

David

Quoted 3 lines
tools/perf/util/print-events.c +0 -0
 			}
 		}
 		last_sdt_name = sdt_name->s;
author maintainer Reviewed-by Ian Rogers
#5 lore raw

Re: [PATCH 3/4] perf list: Don't write to const memory

Quoted 44 lines · David Laight
Quoted 29 lines · On Tue, 20 Jan 2026 19:08:59 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +0 -3
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)

tools/perf/util/print-events.c void print_sdt_events(const struct print_callbacks *print_cb, void *print_state) · line 104

Quoted 10 lines
tools/perf/util/print-events.c +5 -5
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchr(next_sdt_name->s, '@');
+
+				show_detail = bid2 ?
+						strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+						strcmp(sdt_name->s, next_sdt_name->s) == 0;

You could use:

Quoted 2 lines
	show_detail = strncmp(sdt_name->s, next_sdt_name->s, strcspn(sdt_name->s, "@"));

strcspn() will be slower, but it is succinct.

That works.

Quoted 2 lines

I'm sure there is a function like strchr() that returns a pointer to the '\0' when the character isn't found - but I can't remember what it is called :-(

strchrnull()

And this also works and I'll use it:

                                const char *bid2 = strchrnul(next_sdt_name->s, '@');

                                show_detail = strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0;

This way the patch ends up as below, thanks for the suggestion!

Ian, I think I can keep your Reviewed-by, ok?

Cheers,

- Arnaldo

From 02b160f200a2224e8ecf490cf2e316b1a994509a Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Tue, 20 Jan 2026 18:16:09 -0300
Subject: [PATCH 1/1] perf list: Don't write to const memory

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strncnmp() + strchrnul() instead of temporarily scrubbing it with '\0'.

---
 tools/perf/util/print-events.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +3 -8
index 4bbcdbf05b843302..cb27e2898aa0558f 100644
@@ -97,14 +97,9 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchrnul(next_sdt_name->s, '@');
+
+				show_detail = strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0;
 			}
 		}
 		last_sdt_name = sdt_name->s;
Signature · 1 line
2.52.0
reviewer
#6 lore raw

Re: [PATCH 3/4] perf list: Don't write to const memory

Quoted 58 lines · Arnaldo Carvalho de Melo
Quoted 44 lines · David Laight
Quoted 29 lines · On Tue, 20 Jan 2026 19:08:59 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +0 -3
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
            } else {
                    next_sdt_name = strlist__next(sdt_name);
                    if (next_sdt_name) {
-                           char *bid2 = strchr(next_sdt_name->s, '@');
-
-                           if (bid2)

tools/perf/util/print-events.c void print_sdt_events(const struct print_callbacks *print_cb, void *print_state) · line 104

Quoted 10 lines
tools/perf/util/print-events.c +5 -5
-                                   *bid2 = '\0';
-                           if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-                                   show_detail = true;
-                           if (bid2)
-                                   *bid2 = '@';
+                           const char *bid2 = strchr(next_sdt_name->s, '@');
+
+                           show_detail = bid2 ?
+                                           strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+                                           strcmp(sdt_name->s, next_sdt_name->s) == 0;

You could use:

Quoted 2 lines
      show_detail = strncmp(sdt_name->s, next_sdt_name->s, strcspn(sdt_name->s, "@"));

strcspn() will be slower, but it is succinct.

That works.

Quoted 2 lines

I'm sure there is a function like strchr() that returns a pointer to the '\0' when the character isn't found - but I can't remember what it is called :-(

strchrnull()

And this also works and I'll use it:

Quoted 7 lines
                                const char *bid2 = strchrnul(next_sdt_name->s, '@');

                                show_detail = strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0;

This way the patch ends up as below, thanks for the suggestion!

Ian, I think I can keep your Reviewed-by, ok?

Yup.

Thanks,
Ian

Quoted 53 lines

Cheers,

- Arnaldo

From 02b160f200a2224e8ecf490cf2e316b1a994509a Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <[email protected]>
Date: Tue, 20 Jan 2026 18:16:09 -0300
Subject: [PATCH 1/1] perf list: Don't write to const memory

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strncnmp() + strchrnul() instead of temporarily scrubbing it with '\0'.

---
 tools/perf/util/print-events.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +3 -9
index 4bbcdbf05b843302..cb27e2898aa0558f 100644
@@ -97,14 +97,9 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
                } else {
                        next_sdt_name = strlist__next(sdt_name);
                        if (next_sdt_name) {
-                               char *bid2 = strchr(next_sdt_name->s, '@');
-
-                               if (bid2)
-                                       *bid2 = '\0';
-                               if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-                                       show_detail = true;
-                               if (bid2)
-                                       *bid2 = '@';
+                               const char *bid2 = strchrnul(next_sdt_name->s, '@');
+
+                               show_detail = strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0;
                        }
                }
                last_sdt_name = sdt_name->s;
--

2.52.0

#7 lore raw

Re: [PATCH 3/4] perf list: Don't write to const memory

In reply to Arnaldo Carvalho de Melo
Quoted 5 lines · On Tue, 20 Jan 2026 19:08:59 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

Quoted 7 lines

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

I've just looked at the full function to see WTF it is doing. You've fixed the second strchr() not the one the compiler bleated about. Line 89 is followed by:

	if (bid)
		*bid++ = 0;

but if it is NULL there is a fair chance the code will just explode a bit later on. I suspect it is an error if the strings aren't "name@bar"

'show_detail' seems to be set if either the previous or next entries in the list/tree have the same "name" - which seems strange to me.

The while thing needs more work :-(

David

Quoted 30 lines
---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +5 -8
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchr(next_sdt_name->s, '@');
+
+				show_detail = bid2 ?
+						strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+						strcmp(sdt_name->s, next_sdt_name->s) == 0;
 			}
 		}
 		last_sdt_name = sdt_name->s;
author maintainer
#8 lore raw

Re: [PATCH 3/4] perf list: Don't write to const memory

Quoted 13 lines · David Laight
Quoted 10 lines · On Tue, 20 Jan 2026 19:08:59 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~
Quoted 5 lines
Quoted 2 lines

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

I've just looked at the full function to see WTF it is doing. You've fixed the second strchr() not the one the compiler bleated about.

It complained about both, no?

Quoted 4 lines

Line 89 is followed by:

	if (bid)
		*bid++ = 0;

but if it is NULL there is a fair chance the code will just explode a bit later on.

Why, can you elaborate?

Quoted 4 lines

I suspect it is an error if the strings aren't "name@bar"

'show_detail' seems to be set if either the previous or next entries in the list/tree have the same "name" - which seems strange to me.

All this is strange, a corner case, it looks as if we may have multiple binaries, differentiated by buildids, that would have different SDTs.

The code seems to be trying to reduce the amount of info (not showing the buildid if there are no more at that point multiple versions of a DSO with SDTs in place).

Further analysis of the changesets that put all this in place is needed to clarify, but looking just at fixing what the compiler is complaining, do you think the patches are bad?

- Arnaldo

Quoted 34 lines

The while thing needs more work :-(

David

Quoted 30 lines
---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +5 -8
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchr(next_sdt_name->s, '@');
+
+				show_detail = bid2 ?
+						strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+						strcmp(sdt_name->s, next_sdt_name->s) == 0;
 			}
 		}
 		last_sdt_name = sdt_name->s;
#9 lore raw

Re: [PATCH 3/4] perf list: Don't write to const memory

Quoted 20 lines · On Wed, 21 Jan 2026 22:10:18 -0300 Arnaldo Carvalho de Melo <[email protected]>…
Quoted 13 lines · David Laight
Quoted 10 lines · On Tue, 20 Jan 2026 19:08:59 -0300 Arnaldo Carvalho de Melo <[email protected]>…

From: Arnaldo Carvalho de Melo <[email protected]>

Something now detected on fedora 44, where strchr() returns const if it is passed a const pointer:

util/print-events.c: In function 'print_sdt_events':
util/print-events.c:89:29: error: initialization discards 'const' qualifier from pointer target type [-Werror=discarded-qualifiers]

     89 |                 char *bid = strchr(sdt_name->s, '@');
        |                             ^~~~~~
Quoted 5 lines
Quoted 2 lines

Fix it by using strnchr() if strchr finds the separator instead of temporarily scrubbing it with '\0'.

I've just looked at the full function to see WTF it is doing. You've fixed the second strchr() not the one the compiler bleated about.

Quoted 8 lines

It complained about both, no?

Quoted 4 lines

Line 89 is followed by:

	if (bid)
		*bid++ = 0;

but if it is NULL there is a fair chance the code will just explode a bit later on.

Why, can you elaborate?

I don't see why it can't end up in:

		if (show_detail) {
			char *path = build_id_cache__origname(bid);

with 'bid == NULL' and the function just dereferences it.

Quoted 9 lines
Quoted 5 lines

I suspect it is an error if the strings aren't "name@bar"

'show_detail' seems to be set if either the previous or next entries in the list/tree have the same "name" - which seems strange to me.

All this is strange, a corner case, it looks as if we may have multiple binaries, differentiated by buildids, that would have different SDTs.

Quoted 7 lines

The code seems to be trying to reduce the amount of info (not showing the buildid if there are no more at that point multiple versions of a DSO with SDTs in place).

Further analysis of the changesets that put all this in place is needed to clarify, but looking just at fixing what the compiler is complaining, do you think the patches are bad?

I didn't see a patch to fix the first one.
But can you just change the structure so that 's' is 'char *'?

David

Quoted 37 lines

- Arnaldo

Quoted 34 lines

The while thing needs more work :-(

David

Quoted 30 lines
---
 tools/perf/util/print-events.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)
tools/perf/util/print-events.c +5 -8
index 8f3ed83853a9e468..898cf426509790cd 100644
@@ -97,14 +97,11 @@ void print_sdt_events(const struct print_callbacks *print_cb, void *print_state)
 		} else {
 			next_sdt_name = strlist__next(sdt_name);
 			if (next_sdt_name) {
-				char *bid2 = strchr(next_sdt_name->s, '@');
-
-				if (bid2)
-					*bid2 = '\0';
-				if (strcmp(sdt_name->s, next_sdt_name->s) == 0)
-					show_detail = true;
-				if (bid2)
-					*bid2 = '@';
+				const char *bid2 = strchr(next_sdt_name->s, '@');
+
+				show_detail = bid2 ?
+						strncmp(sdt_name->s, next_sdt_name->s, bid2 - next_sdt_name->s) == 0 :
+						strcmp(sdt_name->s, next_sdt_name->s) == 0;
 			}
 		}
 		last_sdt_name = sdt_name->s;