[lttng-tools] check for gettid API during configure
diff mbox series

Message ID 20190727155659.38125-1-raj.khem@gmail.com
State New
Headers show
Series
  • [lttng-tools] check for gettid API during configure
Related show

Commit Message

Khem Raj July 27, 2019, 3:56 p.m. UTC
Add support for gettid() provided by glibc 2.30+

Since version 2.30 glibc provides gettid and it causes conflicts with
locally defined gettid(). Use the local definition of
gettid only if system gettid is not available.

https://sourceware.org/git/?p=glibc.git;a=blob_plain;f=NEWS;hb=HEAD<Paste>

Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 configure.ac            | 2 +-
 src/common/compat/tid.h | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

Patch
diff mbox series

diff --git a/configure.ac b/configure.ac
index 7b99f5c..e4bd82c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,7 @@  AC_CHECK_HEADERS([ \
 # Basic functions check
 AC_CHECK_FUNCS([ \
 	atexit bzero clock_gettime dup2 fdatasync fls ftruncate \
-	gethostbyname gethostname getpagesize localtime_r memchr memset \
+	gethostbyname gethostname getpagesize gettid localtime_r memchr memset \
 	mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \
 	strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \
 	strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \
diff --git a/src/common/compat/tid.h b/src/common/compat/tid.h
index 40f562f..aa07a85 100644
--- a/src/common/compat/tid.h
+++ b/src/common/compat/tid.h
@@ -25,6 +25,7 @@ 
 #ifndef LTTNG_TID_H
 #define LTTNG_TID_H
 
+#if !HAVE_GETTID
 #ifdef __linux__
 #include <syscall.h>
 #endif
@@ -47,5 +48,5 @@  static inline pid_t gettid(void)
 	return getpid();
 }
 #endif
-
+#endif /* HAVE_GETTID */
 #endif /* LTTNG_TID_H */