port: update pthread get/set name compat

Sync the pthread set/get name compat with tools, to add support for
recent FreeBSD and MacOS API.

Change-Id: I9c16fc32e2a75e3f484198279e1660f3e2c5e142
Signed-off-by: Michael Jeanson <mjeanson@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/configure.ac b/configure.ac
index 0bd11f36ff20e666b8a4d78aa849b196b3b71737..a743278f0aa73930afb95c8b9e959a76cf405444 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -167,6 +167,7 @@ AC_CHECK_FUNCS([ \
 
 # Check for pthread_setname_np and its signature
 LTTNG_PTHREAD_SETNAME_NP
+LTTNG_PTHREAD_GETNAME_NP
 
 # AC_FUNC_MALLOC causes problems when cross-compiling.
 #AC_FUNC_MALLOC

diff --git a/liblttng-ust/compat.h b/liblttng-ust/compat.h
index 200d9771f85462b91ceabb7b5404254787e25fb9..7f0f5027ba6c9a619912fdef33cd866954b19f96 100644 (file)
--- a/liblttng-ust/compat.h
+++ b/liblttng-ust/compat.h
@@ -13,6 +13,10 @@
 #include <errno.h>
 #include <string.h>
 
+#ifdef __FreeBSD__
+#include <pthread_np.h>
+#endif
+
 #include <lttng/ust-abi.h>
 
 #define LTTNG_UST_PROCNAME_SUFFIX "-ust"
@@ -32,27 +36,14 @@ int lttng_pthread_setname_np(const char *name)
 
        return pthread_setname_np(pthread_self(), name);
 }
-
-static inline
-int lttng_pthread_getname_np(char *name, size_t len)
-{
-       return pthread_getname_np(pthread_self(), name, len);
-}
 #elif defined(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID)
 static inline
 int lttng_pthread_setname_np(const char *name)
 {
        return pthread_setname_np(name);
 }
-
-static inline
-int lttng_pthread_getname_np(char *name, size_t len)
-{
-       return pthread_getname_np(name, len);
-}
 #elif defined(HAVE_PTHREAD_SET_NAME_NP_WITH_TID)
 
-#include <pthread_np.h>
 static inline
 int lttng_pthread_setname_np(const char *name)
 {
@@ -64,13 +55,6 @@ int lttng_pthread_setname_np(const char *name)
        pthread_set_name_np(pthread_self(), name);
        return 0;
 }
-
-static inline
-int lttng_pthread_getname_np(char *name, size_t len)
-{
-       pthread_get_name_np(pthread_self(), name, len);
-       return 0;
-}
 #elif defined(__linux__)
 
 /* Fallback on prtctl on Linux */
@@ -85,6 +69,35 @@ int lttng_pthread_setname_np(const char *name)
        }
        return prctl(PR_SET_NAME, name, 0, 0, 0);
 }
+#else
+#error "Please add pthread set name support for your OS."
+#endif
+
+
+#if defined(HAVE_PTHREAD_GETNAME_NP_WITH_TID)
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+       return pthread_getname_np(pthread_self(), name, len);
+}
+#elif defined(HAVE_PTHREAD_GETNAME_NP_WITHOUT_TID)
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+       return pthread_getname_np(name, len);
+}
+#elif defined(HAVE_PTHREAD_GET_NAME_NP_WITH_TID)
+
+static inline
+int lttng_pthread_getname_np(char *name, size_t len)
+{
+       pthread_get_name_np(pthread_self(), name, len);
+       return 0;
+}
+#elif defined(__linux__)
+
+/* Fallback on prtctl on Linux */
+#include <sys/prctl.h>
 
 static inline
 int lttng_pthread_getname_np(char *name, size_t len)
@@ -93,7 +106,7 @@ int lttng_pthread_getname_np(char *name, size_t len)
 }
 
 #else
-#error "Please add pthread name support for your OS."
+#error "Please add pthread get name support for your OS."
 #endif
 
 /*

diff --git a/m4/lttng_pthread_getname_np.m4 b/m4/lttng_pthread_getname_np.m4
new file mode 100644 (file)
index 0000000..7ddecf9
--- /dev/null
+++ b/m4/lttng_pthread_getname_np.m4
@@ -0,0 +1,95 @@
+# SYNOPSIS
+#
+#   LTTNG_PTHREAD_GETNAME_NP
+#
+# LICENSE
+#
+#   Copyright (c) 2020 Michael Jeanson <mjeanson@efficios.com>
+#
+#   This program is free software; you can redistribute it and/or modify it
+#   under the terms of the GNU General Public License as published by the
+#   Free Software Foundation; either version 2 of the License, or (at your
+#   option) any later version.
+#
+#   This program is distributed in the hope that it will be useful, but
+#   WITHOUT ANY WARRANTY; without even the implied warranty of
+#   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+#   Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License along
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
+#
+#   As a special exception, the respective Autoconf Macro's copyright owner
+#   gives unlimited permission to copy, distribute and modify the configure
+#   scripts that are the output of Autoconf when processing the Macro. You
+#   need not follow the terms of the GNU General Public License when using
+#   or distributing such scripts, even though portions of the text of the
+#   Macro appear in them. The GNU General Public License (GPL) does govern
+#   all other use of the material that constitutes the Autoconf Macro.
+#
+#   This special exception to the GPL applies to versions of the Autoconf
+#   Macro released by the Autoconf Archive. When you make and distribute a
+#   modified version of the Autoconf Macro, you may extend this special
+#   exception to the GPL to apply to your modified version as well.
+
+AC_DEFUN([LTTNG_PTHREAD_GETNAME_NP], [
+AC_REQUIRE([AX_PTHREAD])
+AC_LANG_PUSH([C])
+
+lttng_pthread_getname_np_save_LDFLAGS="$LDFLAGS"
+lttng_pthread_getname_np_save_LIBS="$LIBS"
+LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
+LIBS="$LIBS $PTHREAD_LIBS"
+
+# GLIBC >= 2.12, Solaris >= 11.3, FreeBSD >= 12.2, MacOS X >= 10.6, iOS >= 3.2
+AC_MSG_CHECKING(for pthread_getname_np(pthread_t, char*, size_t))
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+        [[#include <pthread.h>
+         #ifdef __FreeBSD__
+         #include <pthread_np.h>
+         #endif
+         #define LTTNG_PTHREAD_NAMELEN 16
+         char lttng_pthread_name[LTTNG_PTHREAD_NAMELEN];]],
+        [pthread_getname_np(pthread_self(), lttng_pthread_name, LTTNG_PTHREAD_NAMELEN)])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE(HAVE_PTHREAD_GETNAME_NP_WITH_TID,1,
+        [Have function pthread_getname_np(pthread_t, char*, size_t)])],
+    [AC_MSG_RESULT(no)])
+
+AC_MSG_CHECKING(for pthread_getname_np(char*, size_t))
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+        [[#include <pthread.h>
+         #ifdef __FreeBSD__
+         #include <pthread_np.h>
+         #endif
+         #define LTTNG_PTHREAD_NAMELEN 16
+         char lttng_pthread_name[LTTNG_PTHREAD_NAMELEN];]],
+        [pthread_getname_np(lttng_pthread_name, LTTNG_PTHREAD_NAMELEN)])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE(HAVE_PTHREAD_GETNAME_NP_WITHOUT_TID,1,
+        [Have function pthread_getname_np(char*, size_t)])],
+    [AC_MSG_RESULT(no)])
+
+# FreeBSD
+AC_MSG_CHECKING(for pthread_get_name_np(pthread_t, char*, size_t))
+AC_LINK_IFELSE(
+    [AC_LANG_PROGRAM(
+        [[#include <pthread.h>
+         #ifdef __FreeBSD__
+         #include <pthread_np.h>
+         #endif
+         #define LTTNG_PTHREAD_NAMELEN 16
+         char lttng_pthread_name[LTTNG_PTHREAD_NAMELEN];]],
+        [pthread_get_name_np(pthread_self(), lttng_pthread_name, LTTNG_PTHREAD_NAMELEN)])],
+    [AC_MSG_RESULT(yes)
+     AC_DEFINE(HAVE_PTHREAD_GET_NAME_NP_WITH_TID,1,
+        [Have function pthread_get_name_np(pthread_t, char*, size_t)])],
+    [AC_MSG_RESULT(no)])
+
+LDFLAGS=$lttng_pthread_getname_np_save_LDFLAGS
+LIBS=$lttng_pthread_getname_np_save_LIBS
+
+AC_LANG_POP
+])dnl LTTNG_PTHREAD_GETNAME_NP

diff --git a/m4/lttng_pthread_setname_np.m4 b/m4/lttng_pthread_setname_np.m4
index 6eff705baa3b7a6d00f4c480d19f3c02f7d2b5b1..99fcc8d1e69d79d348f77d058e817619994227f6 100644 (file)
--- a/m4/lttng_pthread_setname_np.m4
+++ b/m4/lttng_pthread_setname_np.m4
@@ -41,11 +41,14 @@ lttng_pthread_setname_np_save_LIBS="$LIBS"
 LDFLAGS="$LDFLAGS $PTHREAD_CFLAGS"
 LIBS="$LIBS $PTHREAD_LIBS"
 
-# GLIBC >= 2.12, Solaris >= 11.3
+# GLIBC >= 2.12, Solaris >= 11.3, FreeBSD >= 12.2
 AC_MSG_CHECKING(for pthread_setname_np(pthread_t, const char*))
 AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
-        [#include <pthread.h>],
+        [[#include <pthread.h>
+         #ifdef __FreeBSD__
+         #include <pthread_np.h>
+         #endif]],
         [pthread_setname_np(pthread_self(), "example")])],
     [AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_PTHREAD_SETNAME_NP_WITH_TID,1,
@@ -56,7 +59,10 @@ AC_LINK_IFELSE(
 AC_MSG_CHECKING(for pthread_setname_np(const char*))
 AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
-        [#include <pthread.h>],
+        [[#include <pthread.h>
+         #ifdef __FreeBSD__
+         #include <pthread_np.h>
+         #endif]],
         [pthread_setname_np("example")])],
     [AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_PTHREAD_SETNAME_NP_WITHOUT_TID,1,
@@ -67,8 +73,10 @@ AC_LINK_IFELSE(
 AC_MSG_CHECKING(for pthread_set_name_np(pthread_t, const char*))
 AC_LINK_IFELSE(
     [AC_LANG_PROGRAM(
-        [#include <pthread.h>
-        #include <pthread_np.h>],
+        [[#include <pthread.h>
+         #ifdef __FreeBSD__
+         #include <pthread_np.h>
+         #endif]],
         [pthread_set_name_np(pthread_self(), "example")])],
     [AC_MSG_RESULT(yes)
      AC_DEFINE(HAVE_PTHREAD_SET_NAME_NP_WITH_TID,1,