| Brad Bishop | 08902b0 | 2019-08-20 09:16:51 -0400 | [diff] [blame] | 1 | From 2bb3e259d0410f16a8b2058a05af434376a1583a Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 26 Jul 2019 09:57:32 -0700 |
| 4 | Subject: [lttng-ust][PATCH] Add config time check for new gettid API |
| 5 | |
| 6 | glibc 2.30 introdoced this function see [1] |
| 7 | so its best to detect it |
| 8 | and provide fallbacks only if its not present |
| 9 | |
| 10 | [1] https://sourceware.org/bugzilla/show_bug.cgi?id=6399 |
| 11 | |
| 12 | Upstream-Status: Submitted [https://lists.lttng.org/pipermail/lttng-dev/2019-July/029131.html] |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | configure.ac | 1 + |
| 17 | include/lttng/ust-tid.h | 7 +++++-- |
| 18 | 2 files changed, 6 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/configure.ac b/configure.ac |
| 21 | index 7fa059a..b1099c1 100644 |
| 22 | --- a/configure.ac |
| 23 | +++ b/configure.ac |
| 24 | @@ -137,6 +137,7 @@ AC_CHECK_FUNCS([ \ |
| 25 | clock_gettime \ |
| 26 | ftruncate \ |
| 27 | getpagesize \ |
| 28 | + gettid \ |
| 29 | gettimeofday \ |
| 30 | localeconv \ |
| 31 | memchr \ |
| 32 | diff --git a/include/lttng/ust-tid.h b/include/lttng/ust-tid.h |
| 33 | index e669d7e..7995c78 100644 |
| 34 | --- a/include/lttng/ust-tid.h |
| 35 | +++ b/include/lttng/ust-tid.h |
| 36 | @@ -26,7 +26,10 @@ |
| 37 | * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE |
| 38 | * SOFTWARE. |
| 39 | */ |
| 40 | - |
| 41 | +#include <config.h> |
| 42 | +#if HAVE_GETTID |
| 43 | +#include <unistd.h> |
| 44 | +#else |
| 45 | #ifdef __linux__ |
| 46 | #include <syscall.h> |
| 47 | #endif |
| 48 | @@ -49,5 +52,5 @@ static inline pid_t gettid(void) |
| 49 | return getpid(); |
| 50 | } |
| 51 | #endif |
| 52 | - |
| 53 | +#endif /* HAVE_GETTID */ |
| 54 | #endif /* _LTTNG_UST_TID_H */ |
| 55 | -- |
| 56 | 2.22.0 |
| 57 | |