diff mbox series

telemetry: fix build on FreeBSD < 12.2

Message ID 20210421181157.1634301-1-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers show
Series telemetry: fix build on FreeBSD < 12.2 | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Thomas Monjalon April 21, 2021, 6:11 p.m. UTC
The function pthread_setname_np() was originally not available on
FreeBSD. It has been added in FreeBSD 12.2:
https://svnweb.freebsd.org/base?view=revision&revision=362264

The EAL implementation of rte_thread_setname() is duplicated
in the telemetry library, which does not depend on EAL,
so the compilation is safe in all systems.

Fixes: 5da7736f8c53 ("telemetry: set socket listener thread name")

Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
---
 lib/telemetry/telemetry.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

Comments

Thomas Monjalon April 21, 2021, 6:14 p.m. UTC | #1
21/04/2021 20:11, Thomas Monjalon:
> The function pthread_setname_np() was originally not available on
> FreeBSD. It has been added in FreeBSD 12.2:
> https://svnweb.freebsd.org/base?view=revision&revision=362264
> 
> The EAL implementation of rte_thread_setname() is duplicated
> in the telemetry library, which does not depend on EAL,
> so the compilation is safe in all systems.
> 
> Fixes: 5da7736f8c53 ("telemetry: set socket listener thread name")
> 
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>

Applied quickly.
diff mbox series

Patch

diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 0b2993396a..386d0080bc 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -432,6 +432,18 @@  create_socket(char *path)
 	return -1;
 }
 
+static void
+set_thread_name(pthread_t id __rte_unused, const char *name __rte_unused)
+{
+#if defined RTE_EXEC_ENV_LINUX && defined __GLIBC__ && defined __GLIBC_PREREQ
+#if __GLIBC_PREREQ(2, 12)
+	pthread_setname_np(id, name);
+#endif
+#elif defined RTE_EXEC_ENV_FREEBSD
+	pthread_set_name_np(id, name);
+#endif
+}
+
 static int
 telemetry_legacy_init(void)
 {
@@ -463,7 +475,7 @@  telemetry_legacy_init(void)
 		return -1;
 	}
 	pthread_setaffinity_np(t_old, sizeof(*thread_cpuset), thread_cpuset);
-	pthread_setname_np(t_old, "telemetry-v1");
+	set_thread_name(t_old, "telemetry-v1");
 	TMTY_LOG(DEBUG, "Legacy telemetry socket initialized ok\n");
 	return 0;
 }
@@ -502,7 +514,7 @@  telemetry_v2_init(void)
 		return -1;
 	}
 	pthread_setaffinity_np(t_new, sizeof(*thread_cpuset), thread_cpuset);
-	pthread_setname_np(t_new, "telemetry-v2");
+	set_thread_name(t_new, "telemetry-v2");
 	atexit(unlink_sockets);
 
 	return 0;